From 2fae90c43373f3255226bfa5870a9e7d11b8e2bb Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Sun, 8 Nov 2015 19:29:26 +0100
Subject: [PATCH 01/87] Some code for sending acknowledgements - some of it
 isn't tested - somehow the ack part seems to be empty, even though the flag
 should be set

---
 .../dissem/bitmessage/BitmessageContext.java  |  4 +-
 .../bitmessage/DefaultMessageListener.java    | 23 ++++--
 .../ch/dissem/bitmessage/InternalContext.java | 75 ++++++++++++-------
 .../bitmessage/entity/BitmessageAddress.java  |  8 ++
 .../dissem/bitmessage/entity/Plaintext.java   | 72 +++++++++++++++---
 .../dissem/bitmessage/entity/payload/Ack.java | 33 ++++++++
 .../bitmessage/entity/payload/Pubkey.java     |  4 +
 .../bitmessage/entity/valueobject/Label.java  |  1 +
 .../ch/dissem/bitmessage/factory/Factory.java |  7 ++
 9 files changed, 181 insertions(+), 46 deletions(-)
 create mode 100644 domain/src/main/java/ch/dissem/bitmessage/entity/payload/Ack.java

diff --git a/domain/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/domain/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 9f4d9a3..8603063 100644
--- a/domain/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/domain/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -156,6 +156,7 @@ public class BitmessageContext {
                 } else {
                     LOG.info("Sending message.");
                     msg.setStatus(DOING_PROOF_OF_WORK);
+                    msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.OUTBOX));
                     ctx.getMessageRepository().save(msg);
                     ctx.send(
                             from,
@@ -165,9 +166,6 @@ public class BitmessageContext {
                             ctx.getNonceTrialsPerByte(to),
                             ctx.getExtraBytes(to)
                     );
-                    msg.setStatus(SENT);
-                    msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.SENT));
-                    ctx.getMessageRepository().save(msg);
                 }
             }
         });
diff --git a/domain/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java b/domain/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
index e069704..c409327 100644
--- a/domain/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
+++ b/domain/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
@@ -118,15 +118,24 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
         for (BitmessageAddress identity : ctx.getAddressRepo().getIdentities()) {
             try {
                 msg.decrypt(identity.getPrivateKey().getPrivateEncryptionKey());
-                msg.getPlaintext().setTo(identity);
-                if (!object.isSignatureValid(msg.getPlaintext().getFrom().getPubkey())) {
+                Plaintext plaintext = msg.getPlaintext();
+                plaintext.setTo(identity);
+                if (!object.isSignatureValid(plaintext.getFrom().getPubkey())) {
                     LOG.warn("Msg with IV " + object.getInventoryVector() + " was successfully decrypted, but signature check failed. Ignoring.");
                 } else {
-                    msg.getPlaintext().setStatus(RECEIVED);
-                    msg.getPlaintext().addLabels(ctx.getMessageRepository().getLabels(Label.Type.INBOX, Label.Type.UNREAD));
-                    msg.getPlaintext().setInventoryVector(object.getInventoryVector());
-                    ctx.getMessageRepository().save(msg.getPlaintext());
-                    listener.receive(msg.getPlaintext());
+                    plaintext.setStatus(RECEIVED);
+                    plaintext.addLabels(ctx.getMessageRepository().getLabels(Label.Type.INBOX, Label.Type.UNREAD));
+                    plaintext.setInventoryVector(object.getInventoryVector());
+                    ctx.getMessageRepository().save(plaintext);
+                    listener.receive(plaintext);
+
+                    if (identity.has(Pubkey.Feature.DOES_ACK)) {
+                        ObjectMessage ack = plaintext.getAckMessage();
+                        if (ack != null) {
+                            ctx.getInventory().storeObject(ack);
+                            ctx.getNetworkHandler().offer(ack.getInventoryVector());
+                        }
+                    }
                 }
                 break;
             } catch (DecryptionFailedException ignore) {
diff --git a/domain/src/main/java/ch/dissem/bitmessage/InternalContext.java b/domain/src/main/java/ch/dissem/bitmessage/InternalContext.java
index 7a89978..1614548 100644
--- a/domain/src/main/java/ch/dissem/bitmessage/InternalContext.java
+++ b/domain/src/main/java/ch/dissem/bitmessage/InternalContext.java
@@ -17,9 +17,8 @@
 package ch.dissem.bitmessage;
 
 import ch.dissem.bitmessage.entity.*;
-import ch.dissem.bitmessage.entity.payload.Broadcast;
-import ch.dissem.bitmessage.entity.payload.GetPubkey;
-import ch.dissem.bitmessage.entity.payload.ObjectPayload;
+import ch.dissem.bitmessage.entity.payload.*;
+import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.ports.*;
 import ch.dissem.bitmessage.utils.Singleton;
 import ch.dissem.bitmessage.utils.UnixTime;
@@ -29,6 +28,7 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.util.TreeSet;
 
+import static ch.dissem.bitmessage.entity.Plaintext.Status.SENT;
 import static ch.dissem.bitmessage.utils.UnixTime.DAY;
 
 /**
@@ -162,39 +162,35 @@ public class InternalContext {
     public void send(final BitmessageAddress from, BitmessageAddress to, final ObjectPayload payload,
                      final long timeToLive, final long nonceTrialsPerByte, final long extraBytes) {
         try {
-            if (to == null) to = from;
+            final BitmessageAddress recipient = (to != null ? to : from);
             long expires = UnixTime.now(+timeToLive);
             LOG.info("Expires at " + expires);
             final ObjectMessage object = new ObjectMessage.Builder()
-                    .stream(to.getStream())
+                    .stream(recipient.getStream())
                     .expiresTime(expires)
                     .payload(payload)
                     .build();
             if (object.isSigned()) {
                 object.sign(from.getPrivateKey());
             }
-            if (payload instanceof Broadcast) {
-                ((Broadcast) payload).encrypt();
-            } else if (payload instanceof Encrypted) {
-                object.encrypt(to.getPubkey());
+            if (payload instanceof Msg && recipient.has(Pubkey.Feature.DOES_ACK)) {
+                ObjectMessage ackMessage = ((Msg) payload).getPlaintext().getAckMessage();
+                messageCallback.proofOfWorkStarted(payload);
+                security.doProofOfWork(ackMessage, networkNonceTrialsPerByte, networkExtraBytes, new ProofOfWorkEngine.Callback() {
+                    @Override
+                    public void onNonceCalculated(byte[] nonce) {
+                        object.encrypt(recipient.getPubkey());
+                        security.doProofOfWork(object, nonceTrialsPerByte, extraBytes, new ProofOfWorkCallback(object, payload));
+                    }
+                });
+            } else {
+                if (payload instanceof Broadcast) {
+                    ((Broadcast) payload).encrypt();
+                } else if (payload instanceof Encrypted) {
+                    object.encrypt(recipient.getPubkey());
+                }
+                security.doProofOfWork(object, nonceTrialsPerByte, extraBytes, new ProofOfWorkCallback(object, payload));
             }
-            messageCallback.proofOfWorkStarted(payload);
-            security.doProofOfWork(object, nonceTrialsPerByte, extraBytes,
-                    new ProofOfWorkEngine.Callback() {
-                        @Override
-                        public void onNonceCalculated(byte[] nonce) {
-                            object.setNonce(nonce);
-                            messageCallback.proofOfWorkCompleted(payload);
-                            if (payload instanceof PlaintextHolder) {
-                                Plaintext plaintext = ((PlaintextHolder) payload).getPlaintext();
-                                plaintext.setInventoryVector(object.getInventoryVector());
-                                messageRepository.save(plaintext);
-                            }
-                            inventory.storeObject(object);
-                            networkHandler.offer(object.getInventoryVector());
-                            messageCallback.messageOffered(payload, object.getInventoryVector());
-                        }
-                    });
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -266,4 +262,31 @@ public class InternalContext {
     public interface ContextHolder {
         void setContext(InternalContext context);
     }
+
+    private class ProofOfWorkCallback implements ProofOfWorkEngine.Callback {
+        private final ObjectMessage object;
+        private final ObjectPayload payload;
+
+        private ProofOfWorkCallback(ObjectMessage object, ObjectPayload payload) {
+            this.object = object;
+            this.payload = payload;
+        }
+
+        @Override
+        public void onNonceCalculated(byte[] nonce) {
+            object.setNonce(nonce);
+            messageCallback.proofOfWorkCompleted(payload);
+            if (payload instanceof PlaintextHolder) {
+                Plaintext plaintext = ((PlaintextHolder) payload).getPlaintext();
+                plaintext.setInventoryVector(object.getInventoryVector());
+                plaintext.setStatus(SENT);
+                plaintext.removeLabel(Label.Type.OUTBOX);
+                plaintext.addLabels(messageRepository.getLabels(Label.Type.SENT));
+                messageRepository.save(plaintext);
+            }
+            inventory.storeObject(object);
+            networkHandler.offer(object.getInventoryVector());
+            messageCallback.messageOffered(payload, object.getInventoryVector());
+        }
+    }
 }
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java b/domain/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
index 0441e6e..380e431 100644
--- a/domain/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
+++ b/domain/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
@@ -17,6 +17,7 @@
 package ch.dissem.bitmessage.entity;
 
 import ch.dissem.bitmessage.entity.payload.Pubkey;
+import ch.dissem.bitmessage.entity.payload.Pubkey.Feature;
 import ch.dissem.bitmessage.entity.payload.V4Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
 import ch.dissem.bitmessage.utils.AccessCounter;
@@ -220,4 +221,11 @@ public class BitmessageAddress implements Serializable {
     public void setSubscribed(boolean subscribed) {
         this.subscribed = subscribed;
     }
+
+    public boolean has(Feature feature) {
+        if (pubkey == null || feature == null) {
+            return false;
+        }
+        return feature.isActive(pubkey.getBehaviorBitfield());
+    }
 }
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java b/domain/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
index eb0a60f..34ecd52 100644
--- a/domain/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
+++ b/domain/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
@@ -16,6 +16,7 @@
 
 package ch.dissem.bitmessage.entity;
 
+import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.factory.Factory;
@@ -26,6 +27,8 @@ import ch.dissem.bitmessage.utils.UnixTime;
 import java.io.*;
 import java.util.*;
 
+import static ch.dissem.bitmessage.utils.Singleton.security;
+
 /**
  * The unencrypted message to be sent by 'msg' or 'broadcast'.
  */
@@ -34,7 +37,8 @@ public class Plaintext implements Streamable {
     private final BitmessageAddress from;
     private final long encoding;
     private final byte[] message;
-    private final byte[] ack;
+    private final byte[] ackData;
+    private ObjectMessage ackMessage;
     private Object id;
     private InventoryVector inventoryVector;
     private BitmessageAddress to;
@@ -53,7 +57,13 @@ public class Plaintext implements Streamable {
         to = builder.to;
         encoding = builder.encoding;
         message = builder.message;
-        ack = builder.ack;
+        ackData = builder.ackData;
+        if (builder.ackMessage != null) {
+            ackMessage = Factory.getObjectMessage(
+                    3,
+                    new ByteArrayInputStream(builder.ackMessage),
+                    builder.ackMessage.length);
+        }
         signature = builder.signature;
         status = builder.status;
         sent = builder.sent;
@@ -159,8 +169,15 @@ public class Plaintext implements Streamable {
         Encode.varInt(message.length, out);
         out.write(message);
         if (type == Type.MSG) {
-            Encode.varInt(ack.length, out);
-            out.write(ack);
+            if (to.has(Pubkey.Feature.DOES_ACK)) {
+                ByteArrayOutputStream ack = new ByteArrayOutputStream();
+                ackMessage.write(ack);
+                byte[] data = ack.toByteArray();
+                Encode.varInt(data.length, out);
+                out.write(data);
+            } else {
+                Encode.varInt(0, out);
+            }
         }
         if (includeSignature) {
             if (signature == null) {
@@ -234,7 +251,7 @@ public class Plaintext implements Streamable {
         return Objects.equals(encoding, plaintext.encoding) &&
                 Objects.equals(from, plaintext.from) &&
                 Arrays.equals(message, plaintext.message) &&
-                Arrays.equals(ack, plaintext.ack) &&
+                Arrays.equals(ackData, plaintext.ackData) &&
                 Arrays.equals(to.getRipe(), plaintext.to.getRipe()) &&
                 Arrays.equals(signature, plaintext.signature) &&
                 Objects.equals(status, plaintext.status) &&
@@ -245,21 +262,46 @@ public class Plaintext implements Streamable {
 
     @Override
     public int hashCode() {
-        return Objects.hash(from, encoding, message, ack, to, signature, status, sent, received, labels);
+        return Objects.hash(from, encoding, message, ackData, to, signature, status, sent, received, labels);
     }
 
     public void addLabels(Label... labels) {
         if (labels != null) {
-            Collections.addAll(this.labels, labels);
+            for (Label label : labels) {
+                this.labels.add(label);
+            }
         }
     }
 
     public void addLabels(Collection<Label> labels) {
         if (labels != null) {
-            this.labels.addAll(labels);
+            for (Label label : labels) {
+                this.labels.add(label);
+            }
         }
     }
 
+    public void removeLabel(Label.Type type) {
+        Iterator<Label> iterator = labels.iterator();
+        while (iterator.hasNext()) {
+            Label label = iterator.next();
+            if (label.getType() == type) {
+                iterator.remove();
+            }
+        }
+    }
+
+    public byte[] getAckData() {
+        return ackData;
+    }
+
+    public ObjectMessage getAckMessage() {
+        if (ackMessage == null) {
+            ackMessage = Factory.createAck(this);
+        }
+        return ackMessage;
+    }
+
     public enum Encoding {
         IGNORE(0), TRIVIAL(1), SIMPLE(2);
 
@@ -304,7 +346,8 @@ public class Plaintext implements Streamable {
         private byte[] destinationRipe;
         private long encoding;
         private byte[] message = new byte[0];
-        private byte[] ack = new byte[0];
+        private byte[] ackData;
+        private byte[] ackMessage;
         private byte[] signature;
         private long sent;
         private long received;
@@ -405,7 +448,13 @@ public class Plaintext implements Streamable {
 
         public Builder ack(byte[] ack) {
             if (type != Type.MSG && ack != null) throw new IllegalArgumentException("ack only allowed for msg");
-            this.ack = ack;
+            this.ackMessage = ack;
+            return this;
+        }
+
+        public Builder ackData(byte[] ackData) {
+            if (type != Type.MSG && ackData != null) throw new IllegalArgumentException("ack only allowed for msg");
+            this.ackData = ackData;
             return this;
         }
 
@@ -449,6 +498,9 @@ public class Plaintext implements Streamable {
             if (to == null && type != Type.BROADCAST) {
                 to = new BitmessageAddress(0, 0, destinationRipe);
             }
+            if (type == Type.MSG && ackMessage == null && ackData == null) {
+                ackData = security().randomBytes(32);
+            }
             return new Plaintext(this);
         }
     }
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/Ack.java b/domain/src/main/java/ch/dissem/bitmessage/entity/payload/Ack.java
new file mode 100644
index 0000000..a8308b9
--- /dev/null
+++ b/domain/src/main/java/ch/dissem/bitmessage/entity/payload/Ack.java
@@ -0,0 +1,33 @@
+package ch.dissem.bitmessage.entity.payload;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * Created by chrigu on 06.11.15.
+ */
+public class Ack extends ObjectPayload {
+    private final long stream;
+    private final byte[] data;
+
+    public Ack(long version, long stream, byte[] data) {
+        super(version);
+        this.stream = stream;
+        this.data = data;
+    }
+
+    @Override
+    public ObjectType getType() {
+        return ObjectType.MSG;
+    }
+
+    @Override
+    public long getStream() {
+        return stream;
+    }
+
+    @Override
+    public void write(OutputStream out) throws IOException {
+        out.write(data);
+    }
+}
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java b/domain/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
index 1243b32..675bc3d 100644
--- a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
+++ b/domain/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
@@ -103,5 +103,9 @@ public abstract class Pubkey extends ObjectPayload {
             }
             return features.toArray(new Feature[features.size()]);
         }
+
+        public boolean isActive(int bitfield) {
+            return (bitfield & bit) != 0;
+        }
     }
 }
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/valueobject/Label.java b/domain/src/main/java/ch/dissem/bitmessage/entity/valueobject/Label.java
index 7c37973..02f0384 100644
--- a/domain/src/main/java/ch/dissem/bitmessage/entity/valueobject/Label.java
+++ b/domain/src/main/java/ch/dissem/bitmessage/entity/valueobject/Label.java
@@ -79,6 +79,7 @@ public class Label implements Serializable {
         INBOX,
         BROADCAST,
         DRAFT,
+        OUTBOX,
         SENT,
         UNREAD,
         TRASH
diff --git a/domain/src/main/java/ch/dissem/bitmessage/factory/Factory.java b/domain/src/main/java/ch/dissem/bitmessage/factory/Factory.java
index 33604ab..135dd93 100644
--- a/domain/src/main/java/ch/dissem/bitmessage/factory/Factory.java
+++ b/domain/src/main/java/ch/dissem/bitmessage/factory/Factory.java
@@ -203,4 +203,11 @@ public class Factory {
             return new V5Broadcast(sendingAddress, plaintext);
         }
     }
+
+    public static ObjectMessage createAck(Plaintext plaintext) {
+        if (plaintext == null || plaintext.getAckData() == null)
+            return null;
+        Ack ack = new Ack(3, plaintext.getFrom().getStream(), plaintext.getAckData());
+        return new ObjectMessage.Builder().payload(ack).build();
+    }
 }

From 5ab577f18a63bdbc310621a46e61c89cfe29b805 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 3 Feb 2016 17:09:26 +0100
Subject: [PATCH 02/87] Update .travis.yml to work with codecov.io

---
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9bcf999..36e370e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,7 @@
 language: java
 jdk:
   - oraclejdk8
+before_install:
+  - pip install codecov
+after_success:
+  - codecov

From ea700755b6efd7a76aba5896be16f5f4701e84c3 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 3 Feb 2016 17:17:31 +0100
Subject: [PATCH 03/87] Update .travis.yml

Another try
---
 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 36e370e..aacb38f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,10 @@
 language: java
+sudo: false # faster builds
 jdk:
   - oraclejdk8
+
 before_install:
-  - pip install codecov
+  - pip install --user codecov
+
 after_success:
   - codecov

From 2bfeedc7a95d8c74f8ff85c1d5d78aaa29745892 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 3 Feb 2016 17:32:04 +0100
Subject: [PATCH 04/87] Update build.gradle

Another try for codecov.io
---
 build.gradle | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b944a14..040afda 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,6 +2,7 @@ subprojects {
     apply plugin: 'java'
     apply plugin: 'maven'
     apply plugin: 'signing'
+    apply plugin: 'jacoco'
 
     sourceCompatibility = 1.7
     group = 'ch.dissem.jabit'
@@ -79,4 +80,13 @@ subprojects {
             }
         }
     }
-}
\ No newline at end of file
+
+    jacocoTestReport {
+        reports {
+            xml.enabled = true
+            html.enabled = true
+        }
+    }
+
+    check.dependsOn jacocoTestReport
+}

From db64b555101f6c7088defcbc192fe03fb91cd9b8 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Sat, 6 Feb 2016 15:47:13 +0100
Subject: [PATCH 05/87] Version 1.0.2-SNAPSHOT bump Fixed NPE if you create a
 Plaintext object without recipient

---
 build.gradle                                                  | 2 +-
 core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 09e7d61..917a0d4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ subprojects {
 
     sourceCompatibility = 1.7
     group = 'ch.dissem.jabit'
-    version = '1.0.1'
+    version = '1.0.2-SNAPSHOT'
 
     ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
index fbd5d48..fc38c65 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
@@ -455,7 +455,7 @@ public class Plaintext implements Streamable {
                         behaviorBitfield
                 ));
             }
-            if (to == null && type != Type.BROADCAST) {
+            if (to == null && type != Type.BROADCAST && destinationRipe != null) {
                 to = new BitmessageAddress(0, 0, destinationRipe);
             }
             return new Plaintext(this);

From 9c375d6608fe1d7f3e0da3db39f448125b055bde Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Sat, 6 Feb 2016 17:27:12 +0100
Subject: [PATCH 06/87] Update README.md

---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index db59adc..8c5a006 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,16 @@
-Jabit [![Build Status](https://travis-ci.org/Dissem/Jabit.svg?branch=master)](https://travis-ci.org/Dissem/Jabit)
+Jabit [![Maven Central](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core)
 =====
 
 A Java implementation for the Bitmessage protocol. To build, use command `gradle build` or `./gradlew build`.
 
 Please note that development is still heavily in progress, and I will break the database a lot until it's ready for prime time.
 
+#### Master
+[![Build Status](https://travis-ci.org/Dissem/Jabit.svg?branch=master)](https://travis-ci.org/Dissem/Jabit) [![codecov.io](https://codecov.io/github/Dissem/Jabit/coverage.svg?branch=master)](https://codecov.io/github/Dissem/Jabit?branch=master)
+
+#### Develop
+[![Build Status](https://travis-ci.org/Dissem/Jabit.svg?branch=develop)](https://travis-ci.org/Dissem/Jabit?branch=develop) [![codecov.io](https://codecov.io/github/Dissem/Jabit/coverage.svg?branch=develop)](https://codecov.io/github/Dissem/Jabit?branch=develop)
+
 Security
 --------
 

From 60adf73616aad41adaabfe663ab69f43a60bb638 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Sun, 7 Feb 2016 23:36:35 +0100
Subject: [PATCH 07/87] Improved tests for repositories

---
 .../repository/JdbcMessageRepositoryTest.java | 39 +++++++--
 .../JdbcProofOfWorkRepositoryTest.java        | 84 +++++++++++++++++++
 2 files changed, 116 insertions(+), 7 deletions(-)
 create mode 100644 repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepositoryTest.java

diff --git a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
index c7c3614..4c93271 100644
--- a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
+++ b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
@@ -30,11 +30,12 @@ import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Random;
 
 import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
 import static ch.dissem.bitmessage.utils.Singleton.security;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.*;
 
 public class JdbcMessageRepositoryTest extends TestBase {
     private BitmessageAddress contactA;
@@ -47,6 +48,7 @@ public class JdbcMessageRepositoryTest extends TestBase {
 
     private Label inbox;
     private Label drafts;
+    private Label unread;
 
     @Before
     public void setUp() throws Exception {
@@ -72,27 +74,28 @@ public class JdbcMessageRepositoryTest extends TestBase {
 
         inbox = repo.getLabels(Label.Type.INBOX).get(0);
         drafts = repo.getLabels(Label.Type.DRAFT).get(0);
+        unread = repo.getLabels(Label.Type.UNREAD).get(0);
 
-        addMessage(contactA, identity, Plaintext.Status.RECEIVED, inbox);
+        addMessage(contactA, identity, Plaintext.Status.RECEIVED, inbox, unread);
         addMessage(identity, contactA, Plaintext.Status.DRAFT, drafts);
-        addMessage(identity, contactB, Plaintext.Status.DRAFT);
+        addMessage(identity, contactB, Plaintext.Status.DRAFT, unread);
     }
 
     @Test
-    public void testGetLabels() throws Exception {
+    public void ensureLabelsAreRetrieved() throws Exception {
         List<Label> labels = repo.getLabels();
         assertEquals(5, labels.size());
     }
 
     @Test
-    public void testGetLabelsByType() throws Exception {
+    public void ensureLabelsCanBeRetrievedByType() throws Exception {
         List<Label> labels = repo.getLabels(Label.Type.INBOX);
         assertEquals(1, labels.size());
         assertEquals("Inbox", labels.get(0).toString());
     }
 
     @Test
-    public void testFindMessagesByLabel() throws Exception {
+    public void ensureMessagesCanBeFoundByLabel() throws Exception {
         List<Plaintext> messages = repo.findMessages(inbox);
         assertEquals(1, messages.size());
         Plaintext m = messages.get(0);
@@ -101,6 +104,28 @@ public class JdbcMessageRepositoryTest extends TestBase {
         assertEquals(Plaintext.Status.RECEIVED, m.getStatus());
     }
 
+    @Test
+    public void ensureUnreadMessagesCanBeFoundForAllLabels() {
+        int unread = repo.countUnread(null);
+        assertThat(unread, is(2));
+    }
+
+    @Test
+    public void ensureUnreadMessagesCanBeFoundByLabel() {
+        int unread = repo.countUnread(inbox);
+        assertThat(unread, is(1));
+    }
+
+    @Test
+    public void ensureMessageCanBeRetrievedByInitialHash() {
+        byte[] initialHash = new byte[64];
+        Plaintext message = repo.findMessages(contactA).get(0);
+        message.setInitialHash(initialHash);
+        repo.save(message);
+        Plaintext other = repo.getMessage(initialHash);
+        assertThat(other, is(message));
+    }
+
     @Test
     public void testFindMessagesByStatus() throws Exception {
         List<Plaintext> messages = repo.findMessages(Plaintext.Status.RECEIVED);
diff --git a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepositoryTest.java b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepositoryTest.java
new file mode 100644
index 0000000..c8fbaf0
--- /dev/null
+++ b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepositoryTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.repository;
+
+import ch.dissem.bitmessage.entity.BitmessageAddress;
+import ch.dissem.bitmessage.entity.ObjectMessage;
+import ch.dissem.bitmessage.entity.payload.GetPubkey;
+import ch.dissem.bitmessage.ports.ProofOfWorkRepository;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Christian Basler
+ */
+public class JdbcProofOfWorkRepositoryTest extends TestBase {
+    private TestJdbcConfig config;
+    private JdbcProofOfWorkRepository repo;
+
+    @Before
+    public void setUp() throws Exception {
+        config = new TestJdbcConfig();
+        config.reset();
+
+        repo = new JdbcProofOfWorkRepository(config);
+
+        repo.putObject(new ObjectMessage.Builder()
+                        .payload(new GetPubkey(new BitmessageAddress("BM-2DAjcCFrqFrp88FUxExhJ9kPqHdunQmiyn"))).build(),
+                1000, 1000);
+    }
+
+    @Test
+    public void ensureObjectIsStored() throws Exception {
+        int sizeBefore = repo.getItems().size();
+        repo.putObject(new ObjectMessage.Builder()
+                        .payload(new GetPubkey(new BitmessageAddress("BM-2D9U2hv3YBMHM1zERP32anKfVKohyPN9x2"))).build(),
+                1000, 1000);
+        assertThat(repo.getItems().size(), is(sizeBefore + 1));
+    }
+
+    @Test
+    public void ensureItemCanBeRetrieved() {
+        byte[] initialHash = repo.getItems().get(0);
+        ProofOfWorkRepository.Item item = repo.getItem(initialHash);
+        assertThat(item, notNullValue());
+        assertThat(item.object.getPayload(), instanceOf(GetPubkey.class));
+        assertThat(item.nonceTrialsPerByte, is(1000L));
+        assertThat(item.extraBytes, is(1000L));
+    }
+
+    @Test(expected = RuntimeException.class)
+    public void ensureRetrievingNonexistingItemThrowsException() {
+        repo.getItem(new byte[0]);
+    }
+
+    @Test
+    public void ensureItemCanBeDeleted() {
+        byte[] initialHash = repo.getItems().get(0);
+        repo.removeObject(initialHash);
+        assertTrue(repo.getItems().isEmpty());
+    }
+
+    @Test
+    public void ensureDeletionOfNonexistingItemIsHandledSilently() {
+        repo.removeObject(new byte[0]);
+    }
+}

From af3e63f592bb076be15ba8715aa730b7dc11f9d0 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Tue, 9 Feb 2016 17:09:22 +0100
Subject: [PATCH 08/87] Improved tests for cryptography

---
 .../bitmessage/entity/payload/CryptoBox.java  |  2 -
 .../bitmessage/security/CryptographyTest.java | 86 +++++++++++++++----
 .../repository/JdbcMessageRepositoryTest.java |  7 +-
 3 files changed, 71 insertions(+), 24 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
index fe45ac5..3d1c926 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
@@ -38,8 +38,6 @@ public class CryptoBox implements Streamable {
     private final byte[] mac;
     private byte[] encrypted;
 
-    private long addressVersion;
-
 
     public CryptoBox(Streamable data, byte[] K) throws IOException {
         this(Encode.bytes(data), K);
diff --git a/cryptography-bc/src/test/java/ch/dissem/bitmessage/security/CryptographyTest.java b/cryptography-bc/src/test/java/ch/dissem/bitmessage/security/CryptographyTest.java
index d4ab2ad..ef3fcbf 100644
--- a/cryptography-bc/src/test/java/ch/dissem/bitmessage/security/CryptographyTest.java
+++ b/cryptography-bc/src/test/java/ch/dissem/bitmessage/security/CryptographyTest.java
@@ -4,19 +4,24 @@ import ch.dissem.bitmessage.InternalContext;
 import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.payload.GenericPayload;
+import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
 import ch.dissem.bitmessage.ports.MultiThreadedPOWEngine;
 import ch.dissem.bitmessage.ports.ProofOfWorkEngine;
 import ch.dissem.bitmessage.utils.CallbackWaiter;
 import ch.dissem.bitmessage.utils.Singleton;
 import ch.dissem.bitmessage.utils.UnixTime;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import javax.xml.bind.DatatypeConverter;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 
+import static ch.dissem.bitmessage.utils.UnixTime.DAY;
 import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -33,50 +38,51 @@ public class CryptographyTest {
     public static final byte[] TEST_RIPEMD160 = DatatypeConverter.parseHexBinary(""
             + "cd566972b5e50104011a92b59fa8e0b1234851ae");
 
-    private static BouncyCryptography security;
+    private static BouncyCryptography crypto;
 
-    public CryptographyTest() {
-        security = new BouncyCryptography();
-        Singleton.initialize(security);
+    @BeforeClass
+    public static void setUp() {
+        crypto = new BouncyCryptography();
+        Singleton.initialize(crypto);
         InternalContext ctx = mock(InternalContext.class);
         when(ctx.getProofOfWorkEngine()).thenReturn(new MultiThreadedPOWEngine());
-        security.setContext(ctx);
+        crypto.setContext(ctx);
     }
 
     @Test
     public void testRipemd160() {
-        assertArrayEquals(TEST_RIPEMD160, security.ripemd160(TEST_VALUE));
+        assertArrayEquals(TEST_RIPEMD160, crypto.ripemd160(TEST_VALUE));
     }
 
     @Test
     public void testSha1() {
-        assertArrayEquals(TEST_SHA1, security.sha1(TEST_VALUE));
+        assertArrayEquals(TEST_SHA1, crypto.sha1(TEST_VALUE));
     }
 
     @Test
     public void testSha512() {
-        assertArrayEquals(TEST_SHA512, security.sha512(TEST_VALUE));
+        assertArrayEquals(TEST_SHA512, crypto.sha512(TEST_VALUE));
     }
 
     @Test
     public void testChaining() {
-        assertArrayEquals(TEST_SHA512, security.sha512("test".getBytes(), "string".getBytes()));
+        assertArrayEquals(TEST_SHA512, crypto.sha512("test".getBytes(), "string".getBytes()));
     }
 
     @Test
-    public void testDoubleHash() {
-        assertArrayEquals(security.sha512(TEST_SHA512), security.doubleSha512(TEST_VALUE));
+    public void ensureDoubleHashYieldsSameResultAsHashOfHash() {
+        assertArrayEquals(crypto.sha512(TEST_SHA512), crypto.doubleSha512(TEST_VALUE));
     }
 
     @Test(expected = IOException.class)
-    public void testProofOfWorkFails() throws IOException {
+    public void ensureExceptionForInsufficientProofOfWork() throws IOException {
         ObjectMessage objectMessage = new ObjectMessage.Builder()
                 .nonce(new byte[8])
-                .expiresTime(UnixTime.now(+2 * MINUTE))
+                .expiresTime(UnixTime.now(+28 * DAY))
                 .objectType(0)
                 .payload(GenericPayload.read(0, new ByteArrayInputStream(new byte[0]), 1, 0))
                 .build();
-        security.checkProofOfWork(objectMessage, 1000, 1000);
+        crypto.checkProofOfWork(objectMessage, 1000, 1000);
     }
 
     @Test
@@ -88,7 +94,7 @@ public class CryptographyTest {
                 .payload(GenericPayload.read(0, new ByteArrayInputStream(new byte[0]), 1, 0))
                 .build();
         final CallbackWaiter<byte[]> waiter = new CallbackWaiter<>();
-        security.doProofOfWork(objectMessage, 1000, 1000,
+        crypto.doProofOfWork(objectMessage, 1000, 1000,
                 new ProofOfWorkEngine.Callback() {
                     @Override
                     public void onNonceCalculated(byte[] initialHash, byte[] nonce) {
@@ -96,6 +102,52 @@ public class CryptographyTest {
                     }
                 });
         objectMessage.setNonce(waiter.waitForValue());
-        security.checkProofOfWork(objectMessage, 1000, 1000);
+        crypto.checkProofOfWork(objectMessage, 1000, 1000);
     }
-}
\ No newline at end of file
+
+    @Test
+    public void ensureEncryptionAndDecryptionWorks() {
+        byte[] data = crypto.randomBytes(100);
+        byte[] key_e = crypto.randomBytes(32);
+        byte[] iv = crypto.randomBytes(16);
+        byte[] encrypted = crypto.crypt(true, data, key_e, iv);
+        byte[] decrypted = crypto.crypt(false, encrypted, key_e, iv);
+        assertArrayEquals(data, decrypted);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void ensureDecryptionFailsWithInvalidCypherText() {
+        byte[] data = crypto.randomBytes(128);
+        byte[] key_e = crypto.randomBytes(32);
+        byte[] iv = crypto.randomBytes(16);
+        crypto.crypt(false, data, key_e, iv);
+    }
+
+    @Test
+    public void testMultiplication() {
+        byte[] a = crypto.randomBytes(PrivateKey.PRIVATE_KEY_SIZE);
+        byte[] A = crypto.createPublicKey(a);
+
+        byte[] b = crypto.randomBytes(PrivateKey.PRIVATE_KEY_SIZE);
+        byte[] B = crypto.createPublicKey(b);
+
+        assertArrayEquals(crypto.multiply(A, b), crypto.multiply(B, a));
+    }
+
+    @Test
+    public void ensureSignatureIsValid() {
+        byte[] data = crypto.randomBytes(100);
+        PrivateKey privateKey = new PrivateKey(false, 1, 1000, 1000);
+        byte[] signature = crypto.getSignature(data, privateKey);
+        assertThat(crypto.isSignatureValid(data, signature, privateKey.getPubkey()), is(true));
+    }
+
+    @Test
+    public void ensureSignatureIsInvalidForTemperedData() {
+        byte[] data = crypto.randomBytes(100);
+        PrivateKey privateKey = new PrivateKey(false, 1, 1000, 1000);
+        byte[] signature = crypto.getSignature(data, privateKey);
+        data[0]++;
+        assertThat(crypto.isSignatureValid(data, signature, privateKey.getPubkey()), is(false));
+    }
+}
diff --git a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
index 4c93271..816eafa 100644
--- a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
+++ b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
@@ -30,7 +30,6 @@ import org.junit.Test;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Random;
 
 import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
 import static ch.dissem.bitmessage.utils.Singleton.security;
@@ -42,8 +41,6 @@ public class JdbcMessageRepositoryTest extends TestBase {
     private BitmessageAddress contactB;
     private BitmessageAddress identity;
 
-    private TestJdbcConfig config;
-    private AddressRepository addressRepo;
     private MessageRepository repo;
 
     private Label inbox;
@@ -52,9 +49,9 @@ public class JdbcMessageRepositoryTest extends TestBase {
 
     @Before
     public void setUp() throws Exception {
-        config = new TestJdbcConfig();
+        TestJdbcConfig config = new TestJdbcConfig();
         config.reset();
-        addressRepo = new JdbcAddressRepository(config);
+        AddressRepository addressRepo = new JdbcAddressRepository(config);
         repo = new JdbcMessageRepository(config);
         new InternalContext(new BitmessageContext.Builder()
                 .cryptography(security())

From e4a69f42b09fe9a95a780f9185528104e830344b Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Sat, 13 Feb 2016 08:03:05 +0100
Subject: [PATCH 09/87] Fixed problem with sending broadcasts (while adding
 some tests)

---
 .../dissem/bitmessage/BitmessageContext.java  |  14 +-
 .../ch/dissem/bitmessage/factory/Factory.java |   3 +-
 .../bitmessage/BitmessageContextTest.java     | 164 ++++++++++++++++++
 .../bitmessage/utils/MessageMatchers.java     |  58 +++++++
 .../java/ch/dissem/bitmessage/SystemTest.java |  38 ++--
 5 files changed, 261 insertions(+), 16 deletions(-)
 create mode 100644 core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
 create mode 100644 core/src/test/java/ch/dissem/bitmessage/utils/MessageMatchers.java

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index c99acfb..24a4aaf 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -26,6 +26,7 @@ import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
+import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.*;
 import ch.dissem.bitmessage.utils.Property;
 import ch.dissem.bitmessage.utils.TTL;
@@ -168,7 +169,7 @@ public class BitmessageContext {
                     ctx.send(
                             msg.getFrom(),
                             to,
-                            new Msg(msg),
+                            wrapInObjectPayload(msg),
                             TTL.msg()
                     );
                     msg.setStatus(SENT);
@@ -179,6 +180,17 @@ public class BitmessageContext {
         });
     }
 
+    private ObjectPayload wrapInObjectPayload(Plaintext msg) {
+        switch (msg.getType()) {
+            case MSG:
+                return new Msg(msg);
+            case BROADCAST:
+                return Factory.getBroadcast(msg);
+            default:
+                throw new RuntimeException("Unknown message type " + msg.getType());
+        }
+    }
+
     public void startup() {
         ctx.getNetworkHandler().start(networkListener);
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
index 33604ab..11d4330 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
@@ -196,7 +196,8 @@ public class Factory {
         }
     }
 
-    public static ObjectPayload getBroadcast(BitmessageAddress sendingAddress, Plaintext plaintext) {
+    public static ObjectPayload getBroadcast(Plaintext plaintext) {
+        BitmessageAddress sendingAddress = plaintext.getFrom();
         if (sendingAddress.getVersion() < 4) {
             return new V4Broadcast(sendingAddress, plaintext);
         } else {
diff --git a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
new file mode 100644
index 0000000..3eead03
--- /dev/null
+++ b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage;
+
+import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
+import ch.dissem.bitmessage.entity.BitmessageAddress;
+import ch.dissem.bitmessage.entity.ObjectMessage;
+import ch.dissem.bitmessage.entity.Plaintext;
+import ch.dissem.bitmessage.entity.payload.ObjectType;
+import ch.dissem.bitmessage.entity.payload.Pubkey;
+import ch.dissem.bitmessage.ports.*;
+import ch.dissem.bitmessage.utils.MessageMatchers;
+import ch.dissem.bitmessage.utils.Singleton;
+import ch.dissem.bitmessage.utils.TestUtils;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.util.LinkedList;
+import java.util.List;
+
+import static ch.dissem.bitmessage.entity.payload.ObjectType.*;
+import static ch.dissem.bitmessage.utils.MessageMatchers.object;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.*;
+
+/**
+ * @author Christian Basler
+ */
+public class BitmessageContextTest {
+    private BitmessageContext ctx;
+    private BitmessageContext.Listener listener;
+
+    @Before
+    public void setUp() throws Exception {
+        Field field = Singleton.class.getDeclaredField("cryptography");
+        field.setAccessible(true);
+        field.set(null, null);
+
+        listener = mock(BitmessageContext.Listener.class);
+        ctx = new BitmessageContext.Builder()
+                .addressRepo(mock(AddressRepository.class))
+                .cryptography(new BouncyCryptography())
+                .inventory(mock(Inventory.class))
+                .listener(listener)
+                .messageCallback(mock(MessageCallback.class))
+                .messageRepo(mock(MessageRepository.class))
+                .networkHandler(mock(NetworkHandler.class))
+                .nodeRegistry(mock(NodeRegistry.class))
+                .powRepo(mock(ProofOfWorkRepository.class))
+                .proofOfWorkEngine(mock(ProofOfWorkEngine.class))
+                .build();
+    }
+
+    @Test
+    public void ensureContactIsSavedAndPubkeyRequested() {
+        BitmessageAddress contact = new BitmessageAddress("BM-opWQhvk9xtMFvQA2Kvetedpk8LkbraWHT");
+        ctx.addContact(contact);
+
+        verify(ctx.addresses(), times(2)).save(contact);
+        verify(ctx.internals().getProofOfWorkEngine())
+                .calculateNonce(any(byte[].class), any(byte[].class), any(ProofOfWorkEngine.Callback.class));
+    }
+
+    @Test
+    public void ensurePubkeyIsNotRequestedIfItExists() throws Exception {
+        ObjectMessage object = TestUtils.loadObjectMessage(2, "V2Pubkey.payload");
+        Pubkey pubkey = (Pubkey) object.getPayload();
+        BitmessageAddress contact = new BitmessageAddress("BM-opWQhvk9xtMFvQA2Kvetedpk8LkbraWHT");
+        contact.setPubkey(pubkey);
+
+        ctx.addContact(contact);
+
+        verify(ctx.addresses(), times(1)).save(contact);
+        verify(ctx.internals().getProofOfWorkEngine(), never())
+                .calculateNonce(any(byte[].class), any(byte[].class), any(ProofOfWorkEngine.Callback.class));
+    }
+
+    @Test
+    public void ensureSubscriptionIsAddedAndExistingBroadcastsRetrieved() throws Exception {
+        BitmessageAddress address = new BitmessageAddress("BM-2D9Vc5rFxxR5vTi53T9gkLfemViHRMVLQZ");
+
+        List<ObjectMessage> objects = new LinkedList<>();
+        objects.add(TestUtils.loadObjectMessage(4, "V4Broadcast.payload"));
+        objects.add(TestUtils.loadObjectMessage(5, "V5Broadcast.payload"));
+        when(ctx.internals().getInventory().getObjects(eq(address.getStream()), anyLong(), any(ObjectType.class)))
+                .thenReturn(objects);
+
+        ctx.addSubscribtion(address);
+
+        verify(ctx.addresses(), times(1)).save(address);
+        assertThat(address.isSubscribed(), is(true));
+        verify(ctx.internals().getInventory()).getObjects(eq(address.getStream()), anyLong(), any(ObjectType.class));
+        verify(listener).receive(any(Plaintext.class));
+    }
+
+    @Test
+    public void ensureIdentityIsCreated() {
+        assertThat(ctx.createIdentity(false), notNullValue());
+    }
+
+    @Test
+    public void ensureMessageIsSent() throws Exception {
+        ctx.send(TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8"), TestUtils.loadContact(),
+                "Subject", "Message");
+        verify(ctx.internals().getProofOfWorkRepository(), timeout(10000).atLeastOnce())
+                .putObject(object(MSG), eq(1000L), eq(1000L));
+        verify(ctx.messages(), timeout(10000).atLeastOnce()).save(MessageMatchers.plaintext(Plaintext.Type.MSG));
+    }
+
+    @Test
+    public void ensurePubkeyIsRequestedIfItIsMissing() throws Exception {
+        ctx.send(TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8"),
+                new BitmessageAddress("BM-opWQhvk9xtMFvQA2Kvetedpk8LkbraWHT"),
+                "Subject", "Message");
+        verify(ctx.internals().getProofOfWorkRepository(), timeout(10000).atLeastOnce())
+                .putObject(object(GET_PUBKEY), eq(1000L), eq(1000L));
+        verify(ctx.messages(), timeout(10000).atLeastOnce()).save(MessageMatchers.plaintext(Plaintext.Type.MSG));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void ensureSenderMustBeIdentity() {
+        ctx.send(new BitmessageAddress("BM-opWQhvk9xtMFvQA2Kvetedpk8LkbraWHT"),
+                new BitmessageAddress("BM-opWQhvk9xtMFvQA2Kvetedpk8LkbraWHT"),
+                "Subject", "Message");
+    }
+
+    @Test
+    public void ensureBroadcastIsSent() throws Exception {
+        ctx.broadcast(TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8"),
+                "Subject", "Message");
+        verify(ctx.internals().getProofOfWorkRepository(), timeout(10000).atLeastOnce())
+                .putObject(object(BROADCAST), eq(1000L), eq(1000L));
+        verify(ctx.internals().getProofOfWorkEngine())
+                .calculateNonce(any(byte[].class), any(byte[].class), any(ProofOfWorkEngine.Callback.class));
+        verify(ctx.messages(), timeout(10000).atLeastOnce()).save(MessageMatchers.plaintext(Plaintext.Type.BROADCAST));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void ensureSenderWithoutPrivateKeyThrowsException() {
+        Plaintext msg = new Plaintext.Builder(Plaintext.Type.BROADCAST)
+                .from(new BitmessageAddress("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8"))
+                .message("Subject", "Message")
+                .build();
+        ctx.send(msg);
+    }
+}
diff --git a/core/src/test/java/ch/dissem/bitmessage/utils/MessageMatchers.java b/core/src/test/java/ch/dissem/bitmessage/utils/MessageMatchers.java
new file mode 100644
index 0000000..8bb1e36
--- /dev/null
+++ b/core/src/test/java/ch/dissem/bitmessage/utils/MessageMatchers.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.utils;
+
+import ch.dissem.bitmessage.entity.ObjectMessage;
+import ch.dissem.bitmessage.entity.Plaintext;
+import ch.dissem.bitmessage.entity.payload.ObjectType;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
+import org.hamcrest.Matcher;
+import org.mockito.Matchers;
+
+/**
+ * @author Christian Basler
+ */
+public class MessageMatchers {
+    public static Plaintext plaintext(final Plaintext.Type type) {
+        return Matchers.argThat(new BaseMatcher<Plaintext>() {
+            @Override
+            public boolean matches(Object item) {
+                return item instanceof Plaintext && ((Plaintext) item).getType() == type;
+            }
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("type should be ").appendValue(type);
+            }
+        });
+    }
+
+    public static ObjectMessage object(final ObjectType type) {
+        return Matchers.argThat(new BaseMatcher<ObjectMessage>() {
+            @Override
+            public boolean matches(Object item) {
+                return item instanceof ObjectMessage && ((ObjectMessage) item).getPayload().getType() == type;
+            }
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("payload type should be ").appendValue(type);
+            }
+        });
+    }
+}
diff --git a/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java b/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
index 1309336..a2e3da7 100644
--- a/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
+++ b/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
@@ -6,9 +6,7 @@ import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.networking.DefaultNetworkHandler;
 import ch.dissem.bitmessage.repository.*;
 import ch.dissem.bitmessage.utils.TTL;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -21,16 +19,16 @@ import static org.junit.Assert.assertThat;
  * @author Christian Basler
  */
 public class SystemTest {
-    static BitmessageContext alice;
-    static TestListener aliceListener = new TestListener();
-    static BitmessageAddress aliceIdentity;
+    private BitmessageContext alice;
+    private TestListener aliceListener = new TestListener();
+    private BitmessageAddress aliceIdentity;
 
-    static BitmessageContext bob;
-    static TestListener bobListener = new TestListener();
-    static BitmessageAddress bobIdentity;
+    private BitmessageContext bob;
+    private TestListener bobListener = new TestListener();
+    private BitmessageAddress bobIdentity;
 
-    @BeforeClass
-    public static void setUp() {
+    @Before
+    public void setUp() {
         TTL.msg(5 * MINUTE);
         TTL.getpubkey(5 * MINUTE);
         TTL.pubkey(5 * MINUTE);
@@ -65,20 +63,32 @@ public class SystemTest {
         bobIdentity = bob.createIdentity(false);
     }
 
-    @AfterClass
-    public static void tearDown() {
+    @After
+    public void tearDown() {
         alice.shutdown();
         bob.shutdown();
     }
 
     @Test
     public void ensureAliceCanSendMessageToBob() throws Exception {
-        bobListener.reset();
         String originalMessage = UUID.randomUUID().toString();
         alice.send(aliceIdentity, new BitmessageAddress(bobIdentity.getAddress()), "Subject", originalMessage);
 
         Plaintext plaintext = bobListener.get(15, TimeUnit.MINUTES);
 
+        assertThat(plaintext.getType(), equalTo(Plaintext.Type.MSG));
+        assertThat(plaintext.getText(), equalTo(originalMessage));
+    }
+
+    @Test
+    public void ensureBobCanReceiveBroadcastFromAlice() throws Exception {
+        String originalMessage = UUID.randomUUID().toString();
+        bob.addSubscribtion(new BitmessageAddress(aliceIdentity.getAddress()));
+        alice.broadcast(aliceIdentity, "Subject", originalMessage);
+
+        Plaintext plaintext = bobListener.get(15, TimeUnit.MINUTES);
+
+        assertThat(plaintext.getType(), equalTo(Plaintext.Type.BROADCAST));
         assertThat(plaintext.getText(), equalTo(originalMessage));
     }
 }

From f71671e04ad8c4c46e424878315e44c6ef4b5caa Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 15 Feb 2016 07:33:38 +0100
Subject: [PATCH 10/87] Added tests for DefaultMessageListener and
 ProofOfWorkService and some minor improvements

---
 .../dissem/bitmessage/ProofOfWorkService.java |   6 +-
 .../ch/dissem/bitmessage/factory/Factory.java |   2 +-
 .../ch/dissem/bitmessage/utils/Singleton.java |   6 +-
 .../bitmessage/BitmessageContextTest.java     |  54 ++++++-
 .../DefaultMessageListenerTest.java           | 150 ++++++++++++++++++
 .../bitmessage/ProofOfWorkServiceTest.java    | 113 +++++++++++++
 .../ch/dissem/bitmessage/utils/TestBase.java  |   6 +-
 7 files changed, 321 insertions(+), 16 deletions(-)
 create mode 100644 core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
 create mode 100644 core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java

diff --git a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
index ecd1099..ad62dde 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
@@ -5,10 +5,10 @@ import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.PlaintextHolder;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
+import ch.dissem.bitmessage.ports.Cryptography;
 import ch.dissem.bitmessage.ports.MessageRepository;
 import ch.dissem.bitmessage.ports.ProofOfWorkEngine;
 import ch.dissem.bitmessage.ports.ProofOfWorkRepository;
-import ch.dissem.bitmessage.ports.Cryptography;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,16 +61,14 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
     public void onNonceCalculated(byte[] initialHash, byte[] nonce) {
         ObjectMessage object = powRepo.getItem(initialHash).object;
         object.setNonce(nonce);
-//        messageCallback.proofOfWorkCompleted(payload);
         Plaintext plaintext = messageRepo.getMessage(initialHash);
         if (plaintext != null) {
             plaintext.setInventoryVector(object.getInventoryVector());
             messageRepo.save(plaintext);
         }
         ctx.getInventory().storeObject(object);
-        ctx.getProofOfWorkRepository().removeObject(initialHash);
+        powRepo.removeObject(initialHash);
         ctx.getNetworkHandler().offer(object.getInventoryVector());
-//        messageCallback.messageOffered(payload, object.getInventoryVector());
     }
 
     @Override
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
index 11d4330..e0db3f4 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
@@ -196,7 +196,7 @@ public class Factory {
         }
     }
 
-    public static ObjectPayload getBroadcast(Plaintext plaintext) {
+    public static Broadcast getBroadcast(Plaintext plaintext) {
         BitmessageAddress sendingAddress = plaintext.getFrom();
         if (sendingAddress.getVersion() < 4) {
             return new V4Broadcast(sendingAddress, plaintext);
diff --git a/core/src/main/java/ch/dissem/bitmessage/utils/Singleton.java b/core/src/main/java/ch/dissem/bitmessage/utils/Singleton.java
index 0c7134b..a751c65 100644
--- a/core/src/main/java/ch/dissem/bitmessage/utils/Singleton.java
+++ b/core/src/main/java/ch/dissem/bitmessage/utils/Singleton.java
@@ -19,16 +19,14 @@ package ch.dissem.bitmessage.utils;
 import ch.dissem.bitmessage.ports.Cryptography;
 
 /**
- * Created by chris on 20.07.15.
+ * @author Christian Basler
  */
 public class Singleton {
     private static Cryptography cryptography;
 
     public static void initialize(Cryptography cryptography) {
         synchronized (Singleton.class) {
-            if (Singleton.cryptography == null) {
-                Singleton.cryptography = cryptography;
-            }
+            Singleton.cryptography = cryptography;
         }
     }
 
diff --git a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
index 3eead03..828e794 100644
--- a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
@@ -26,10 +26,12 @@ import ch.dissem.bitmessage.ports.*;
 import ch.dissem.bitmessage.utils.MessageMatchers;
 import ch.dissem.bitmessage.utils.Singleton;
 import ch.dissem.bitmessage.utils.TestUtils;
+import org.hamcrest.BaseMatcher;
+import org.hamcrest.Description;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.lang.reflect.Field;
+import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -50,10 +52,7 @@ public class BitmessageContextTest {
 
     @Before
     public void setUp() throws Exception {
-        Field field = Singleton.class.getDeclaredField("cryptography");
-        field.setAccessible(true);
-        field.set(null, null);
-
+        Singleton.initialize(null);
         listener = mock(BitmessageContext.Listener.class);
         ctx = new BitmessageContext.Builder()
                 .addressRepo(mock(AddressRepository.class))
@@ -93,6 +92,51 @@ public class BitmessageContextTest {
                 .calculateNonce(any(byte[].class), any(byte[].class), any(ProofOfWorkEngine.Callback.class));
     }
 
+    @Test
+    public void ensureV2PubkeyIsNotRequestedIfItExistsInInventory() throws Exception {
+        BitmessageAddress contact = new BitmessageAddress("BM-opWQhvk9xtMFvQA2Kvetedpk8LkbraWHT");
+        when(ctx.internals().getInventory().getObjects(anyLong(), anyLong(), any(ObjectType.class)))
+                .thenReturn(Collections.singletonList(
+                        TestUtils.loadObjectMessage(2, "V2Pubkey.payload")
+                ));
+
+        ctx.addContact(contact);
+
+        verify(ctx.addresses(), atLeastOnce()).save(contact);
+        verify(ctx.internals().getProofOfWorkEngine(), never())
+                .calculateNonce(any(byte[].class), any(byte[].class), any(ProofOfWorkEngine.Callback.class));
+    }
+
+    @Test
+    public void ensureV4PubkeyIsNotRequestedIfItExistsInInventory() throws Exception {
+        BitmessageAddress contact = new BitmessageAddress("BM-2cXxfcSetKnbHJX2Y85rSkaVpsdNUZ5q9h");
+        when(ctx.internals().getInventory().getObjects(anyLong(), anyLong(), any(ObjectType.class)))
+                .thenReturn(Collections.singletonList(
+                        TestUtils.loadObjectMessage(2, "V4Pubkey.payload")
+                ));
+        final BitmessageAddress stored = new BitmessageAddress(contact.getAddress());
+        stored.setAlias("Test");
+        when(ctx.addresses().getAddress(contact.getAddress())).thenReturn(stored);
+
+        ctx.addContact(contact);
+
+        verify(ctx.addresses(), atLeastOnce()).save(argThat(new BaseMatcher<BitmessageAddress>() {
+            @Override
+            public boolean matches(Object item) {
+                return item instanceof BitmessageAddress
+                        && ((BitmessageAddress) item).getPubkey() != null
+                        && stored.getAlias().equals(((BitmessageAddress) item).getAlias());
+            }
+
+            @Override
+            public void describeTo(Description description) {
+                description.appendText("pubkey must not be null and alias must be ").appendValue(stored.getAlias());
+            }
+        }));
+        verify(ctx.internals().getProofOfWorkEngine(), never())
+                .calculateNonce(any(byte[].class), any(byte[].class), any(ProofOfWorkEngine.Callback.class));
+    }
+
     @Test
     public void ensureSubscriptionIsAddedAndExistingBroadcastsRetrieved() throws Exception {
         BitmessageAddress address = new BitmessageAddress("BM-2D9Vc5rFxxR5vTi53T9gkLfemViHRMVLQZ");
diff --git a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
new file mode 100644
index 0000000..a6e6c53
--- /dev/null
+++ b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage;
+
+import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
+import ch.dissem.bitmessage.entity.BitmessageAddress;
+import ch.dissem.bitmessage.entity.ObjectMessage;
+import ch.dissem.bitmessage.entity.Plaintext;
+import ch.dissem.bitmessage.entity.payload.Broadcast;
+import ch.dissem.bitmessage.entity.payload.GetPubkey;
+import ch.dissem.bitmessage.entity.payload.Msg;
+import ch.dissem.bitmessage.factory.Factory;
+import ch.dissem.bitmessage.ports.AddressRepository;
+import ch.dissem.bitmessage.ports.MessageRepository;
+import ch.dissem.bitmessage.utils.Singleton;
+import ch.dissem.bitmessage.utils.TestBase;
+import ch.dissem.bitmessage.utils.TestUtils;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Collections;
+
+import static ch.dissem.bitmessage.entity.Plaintext.Status.PUBKEY_REQUESTED;
+import static ch.dissem.bitmessage.entity.Plaintext.Type.BROADCAST;
+import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
+import static ch.dissem.bitmessage.utils.MessageMatchers.plaintext;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.*;
+
+/**
+ * @author Christian Basler
+ */
+public class DefaultMessageListenerTest extends TestBase {
+    @Mock
+    private AddressRepository addressRepo;
+    @Mock
+    private MessageRepository messageRepo;
+
+    private InternalContext ctx;
+    private DefaultMessageListener listener;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        ctx = mock(InternalContext.class);
+        Singleton.initialize(new BouncyCryptography());
+        when(ctx.getAddressRepository()).thenReturn(addressRepo);
+        when(ctx.getMessageRepository()).thenReturn(messageRepo);
+
+        listener = new DefaultMessageListener(ctx, mock(BitmessageContext.Listener.class));
+    }
+
+    @Test
+    public void ensurePubkeyIsSentOnRequest() throws Exception {
+        BitmessageAddress identity = TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8");
+        when(addressRepo.findIdentity(any(byte[].class)))
+                .thenReturn(identity);
+        listener.receive(new ObjectMessage.Builder()
+                .stream(2)
+                .payload(new GetPubkey(new BitmessageAddress("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8")))
+                .build());
+        verify(ctx).sendPubkey(eq(identity), eq(2L));
+    }
+
+    @Test
+    public void ensureIncomingPubkeyIsAddedToContact() throws Exception {
+        BitmessageAddress identity = TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8");
+        BitmessageAddress contact = new BitmessageAddress(identity.getAddress());
+        when(addressRepo.findContact(any(byte[].class)))
+                .thenReturn(contact);
+        when(messageRepo.findMessages(eq(PUBKEY_REQUESTED), eq(contact)))
+                .thenReturn(Collections.singletonList(
+                        new Plaintext.Builder(MSG).from(identity).to(contact).message("S", "T").build()
+                ));
+
+        ObjectMessage objectMessage = new ObjectMessage.Builder()
+                .stream(2)
+                .payload(identity.getPubkey())
+                .build();
+        objectMessage.sign(identity.getPrivateKey());
+        objectMessage.encrypt(Singleton.security().createPublicKey(identity.getPublicDecryptionKey()));
+        listener.receive(objectMessage);
+
+        verify(addressRepo).save(any(BitmessageAddress.class));
+    }
+
+    @Test
+    public void ensureIncomingMessageIsSaved() throws Exception {
+        BitmessageAddress identity = TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8");
+        BitmessageAddress contact = new BitmessageAddress(identity.getAddress());
+
+        when(addressRepo.getIdentities()).thenReturn(Collections.singletonList(identity));
+
+        ObjectMessage objectMessage = new ObjectMessage.Builder()
+                .stream(2)
+                .payload(new Msg(new Plaintext.Builder(MSG)
+                        .from(identity)
+                        .to(contact)
+                        .message("S", "T")
+                        .build()))
+                .nonce(new byte[8])
+                .build();
+        objectMessage.sign(identity.getPrivateKey());
+        objectMessage.encrypt(identity.getPubkey());
+
+        listener.receive(objectMessage);
+
+        verify(messageRepo, atLeastOnce()).save(plaintext(MSG));
+    }
+
+    @Test
+    public void ensureIncomingBroadcastIsSaved() throws Exception {
+        BitmessageAddress identity = TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8");
+
+        when(addressRepo.getSubscriptions(anyLong())).thenReturn(Collections.singletonList(identity));
+
+        Broadcast broadcast = Factory.getBroadcast(new Plaintext.Builder(BROADCAST)
+                .from(identity)
+                .message("S", "T")
+                .build());
+        ObjectMessage objectMessage = new ObjectMessage.Builder()
+                .stream(2)
+                .payload(broadcast)
+                .nonce(new byte[8])
+                .build();
+        objectMessage.sign(identity.getPrivateKey());
+        broadcast.encrypt();
+
+        listener.receive(objectMessage);
+
+        verify(messageRepo, atLeastOnce()).save(plaintext(BROADCAST));
+    }
+}
diff --git a/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java b/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
new file mode 100644
index 0000000..eb5d368
--- /dev/null
+++ b/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage;
+
+import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
+import ch.dissem.bitmessage.entity.BitmessageAddress;
+import ch.dissem.bitmessage.entity.ObjectMessage;
+import ch.dissem.bitmessage.entity.Plaintext;
+import ch.dissem.bitmessage.entity.payload.GetPubkey;
+import ch.dissem.bitmessage.entity.payload.Msg;
+import ch.dissem.bitmessage.ports.*;
+import ch.dissem.bitmessage.utils.Singleton;
+import ch.dissem.bitmessage.utils.TestUtils;
+import org.hamcrest.CoreMatchers;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Arrays;
+
+import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.*;
+
+/**
+ * @author Christian Basler
+ */
+public class ProofOfWorkServiceTest {
+    private ProofOfWorkService proofOfWorkService;
+
+    private Cryptography cryptography;
+    @Mock
+    private InternalContext ctx;
+    @Mock
+    private ProofOfWorkRepository proofOfWorkRepo;
+    @Mock
+    private Inventory inventory;
+    @Mock
+    private NetworkHandler networkHandler;
+    @Mock
+    private MessageRepository messageRepo;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        cryptography = spy(new BouncyCryptography());
+        Singleton.initialize(cryptography);
+
+        ctx = mock(InternalContext.class);
+        when(ctx.getProofOfWorkRepository()).thenReturn(proofOfWorkRepo);
+        when(ctx.getInventory()).thenReturn(inventory);
+        when(ctx.getNetworkHandler()).thenReturn(networkHandler);
+        when(ctx.getMessageRepository()).thenReturn(messageRepo);
+
+        proofOfWorkService = new ProofOfWorkService();
+        proofOfWorkService.setContext(ctx);
+    }
+
+    @Test
+    public void ensureMissingProofOfWorkIsDone() {
+        when(proofOfWorkRepo.getItems()).thenReturn(Arrays.asList(new byte[64]));
+        when(proofOfWorkRepo.getItem(any(byte[].class))).thenReturn(new ProofOfWorkRepository.Item(null, 1001, 1002));
+        doNothing().when(cryptography).doProofOfWork(any(ObjectMessage.class), anyLong(), anyLong(), any(ProofOfWorkEngine.Callback.class));
+
+        proofOfWorkService.doMissingProofOfWork();
+
+        verify(cryptography).doProofOfWork((ObjectMessage) isNull(), eq(1001L), eq(1002L),
+                any(ProofOfWorkEngine.Callback.class));
+    }
+
+    @Test
+    public void ensureCalculatedNonceIsStored() throws Exception {
+        BitmessageAddress identity = TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8");
+        BitmessageAddress address = TestUtils.loadContact();
+        Plaintext plaintext = new Plaintext.Builder(MSG).from(identity).to(address).message("", "").build();
+        ObjectMessage object = new ObjectMessage.Builder()
+                .payload(new Msg(plaintext))
+                .build();
+        object.sign(identity.getPrivateKey());
+        object.encrypt(address.getPubkey());
+        byte[] initialHash = new byte[64];
+        byte[] nonce = new byte[]{1, 2, 3, 4, 5, 6, 7, 8};
+
+        when(proofOfWorkRepo.getItem(initialHash)).thenReturn(new ProofOfWorkRepository.Item(object, 1001, 1002));
+        when(messageRepo.getMessage(initialHash)).thenReturn(plaintext);
+
+        proofOfWorkService.onNonceCalculated(initialHash, nonce);
+
+        verify(proofOfWorkRepo).removeObject(eq(initialHash));
+        verify(inventory).storeObject(eq(object));
+        verify(networkHandler).offer(eq(object.getInventoryVector()));
+        assertThat(plaintext.getInventoryVector(), equalTo(object.getInventoryVector()));
+    }
+}
diff --git a/core/src/test/java/ch/dissem/bitmessage/utils/TestBase.java b/core/src/test/java/ch/dissem/bitmessage/utils/TestBase.java
index e757d91..4c73fe3 100644
--- a/core/src/test/java/ch/dissem/bitmessage/utils/TestBase.java
+++ b/core/src/test/java/ch/dissem/bitmessage/utils/TestBase.java
@@ -17,12 +17,14 @@
 package ch.dissem.bitmessage.utils;
 
 import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
+import org.junit.BeforeClass;
 
 /**
- * Created by chris on 20.07.15.
+ * @author Christian Basler
  */
 public class TestBase {
-    static {
+    @BeforeClass
+    public static void setUpClass() {
         Singleton.initialize(new BouncyCryptography());
     }
 }

From ccb102efd7869edd59ce282f1145b737db2a260e Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 15 Feb 2016 16:54:13 +0100
Subject: [PATCH 11/87] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8c5a006..d112d3e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Jabit [![Maven Central](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core)
+Jabit [![Maven Central](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core) [![Javadoc](https://javadoc-emblem.rhcloud.com/doc/ch.dissem.jabit/jabit-core/badge.svg)](http://www.javadoc.io/doc/ch.dissem.jabit/jabit-core)
 =====
 
 A Java implementation for the Bitmessage protocol. To build, use command `gradle build` or `./gradlew build`.

From 86accb94f21bddd47e46726a68de927888b9c29b Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 24 Feb 2016 14:34:14 +0100
Subject: [PATCH 12/87] Update README.md

added link to IRC channel (thanks, kiwiirc!)
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d112d3e..94d5419 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Jabit [![Maven Central](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core) [![Javadoc](https://javadoc-emblem.rhcloud.com/doc/ch.dissem.jabit/jabit-core/badge.svg)](http://www.javadoc.io/doc/ch.dissem.jabit/jabit-core)
+Jabit [![Maven Central](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core) [![Javadoc](https://javadoc-emblem.rhcloud.com/doc/ch.dissem.jabit/jabit-core/badge.svg)](http://www.javadoc.io/doc/ch.dissem.jabit/jabit-core) [![Visit our IRC channel](https://img.shields.io/badge/irc-%23jabit-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/#jabit)
 =====
 
 A Java implementation for the Bitmessage protocol. To build, use command `gradle build` or `./gradlew build`.

From a72718d4e8c51722ab5db78902e23aa369eeec54 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 24 Feb 2016 16:53:11 +0100
Subject: [PATCH 13/87] Update README.md

---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 94d5419..4d11060 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,13 @@
-Jabit [![Maven Central](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core) [![Javadoc](https://javadoc-emblem.rhcloud.com/doc/ch.dissem.jabit/jabit-core/badge.svg)](http://www.javadoc.io/doc/ch.dissem.jabit/jabit-core) [![Visit our IRC channel](https://img.shields.io/badge/irc-%23jabit-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/#jabit)
+Jabit
 =====
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core)
+[![Javadoc](https://javadoc-emblem.rhcloud.com/doc/ch.dissem.jabit/jabit-core/badge.svg)](http://www.javadoc.io/doc/ch.dissem.jabit/jabit-core)
+[![GitHub license](https://img.shields.io/github/license/Dissem/Jabit.svg)](https://raw.githubusercontent.com/Dissem/Jabit/master/LICENSE)
+[![Visit our IRC channel](https://img.shields.io/badge/irc-%23jabit-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/#jabit)
 
 A Java implementation for the Bitmessage protocol. To build, use command `gradle build` or `./gradlew build`.
 
-Please note that development is still heavily in progress, and I will break the database a lot until it's ready for prime time.
+There are still some features missing, most notably acknowledgements. The API however should be stable, and it should work well enough for most use cases.
 
 #### Master
 [![Build Status](https://travis-ci.org/Dissem/Jabit.svg?branch=master)](https://travis-ci.org/Dissem/Jabit) [![codecov.io](https://codecov.io/github/Dissem/Jabit/coverage.svg?branch=master)](https://codecov.io/github/Dissem/Jabit?branch=master)

From 4dd639e6515c41630a21dcbf8fe5289d4c33adea Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 24 Feb 2016 22:51:35 +0100
Subject: [PATCH 14/87] Code cleanup

---
 .../bitmessage/BaseMessageCallback.java       | 47 +++++++++++++++++++
 .../dissem/bitmessage/BitmessageContext.java  | 18 +------
 .../bitmessage/DefaultMessageListener.java    |  5 +-
 .../ch/dissem/bitmessage/InternalContext.java |  5 +-
 .../bitmessage/entity/NetworkMessage.java     |  3 +-
 .../bitmessage/entity/ObjectMessage.java      |  3 --
 .../entity/valueobject/NetworkAddress.java    |  3 +-
 .../exception/ApplicationException.java       | 26 ++++++++++
 .../bitmessage/entity/SerializationTest.java  |  1 +
 .../bitmessage/security/CryptographyTest.java |  8 +++-
 .../bitmessage/networking/Connection.java     |  2 +-
 .../networking/DefaultNetworkHandler.java     |  2 +
 .../networking/NetworkHandlerTest.java        | 16 +++----
 .../bitmessage/repository/JdbcInventory.java  |  5 +-
 14 files changed, 107 insertions(+), 37 deletions(-)
 create mode 100644 core/src/main/java/ch/dissem/bitmessage/BaseMessageCallback.java
 create mode 100644 core/src/main/java/ch/dissem/bitmessage/exception/ApplicationException.java

diff --git a/core/src/main/java/ch/dissem/bitmessage/BaseMessageCallback.java b/core/src/main/java/ch/dissem/bitmessage/BaseMessageCallback.java
new file mode 100644
index 0000000..bf46b74
--- /dev/null
+++ b/core/src/main/java/ch/dissem/bitmessage/BaseMessageCallback.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage;
+
+import ch.dissem.bitmessage.entity.payload.ObjectPayload;
+import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
+
+/**
+ * Default implementation that doesn't do anything.
+ *
+ * @author Christian Basler
+ */
+public class BaseMessageCallback implements MessageCallback {
+    @Override
+    public void proofOfWorkStarted(ObjectPayload message) {
+        // No op
+    }
+
+    @Override
+    public void proofOfWorkCompleted(ObjectPayload message) {
+        // No op
+    }
+
+    @Override
+    public void messageOffered(ObjectPayload message, InventoryVector iv) {
+        // No op
+    }
+
+    @Override
+    public void messageAcknowledged(InventoryVector iv) {
+        // No op
+    }
+}
diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 24a4aaf..94cf3c3 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -410,23 +410,7 @@ public class BitmessageContext {
                 proofOfWorkEngine = new MultiThreadedPOWEngine();
             }
             if (messageCallback == null) {
-                messageCallback = new MessageCallback() {
-                    @Override
-                    public void proofOfWorkStarted(ObjectPayload message) {
-                    }
-
-                    @Override
-                    public void proofOfWorkCompleted(ObjectPayload message) {
-                    }
-
-                    @Override
-                    public void messageOffered(ObjectPayload message, InventoryVector iv) {
-                    }
-
-                    @Override
-                    public void messageAcknowledged(InventoryVector iv) {
-                    }
-                };
+                messageCallback = new BaseMessageCallback();
             }
             if (customCommandHandler == null) {
                 customCommandHandler = new CustomCommandHandler() {
diff --git a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
index b2366e4..dcc62b9 100644
--- a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
+++ b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
@@ -65,6 +65,9 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
                 receive(object, (Broadcast) payload);
                 break;
             }
+            default: {
+                throw new IllegalArgumentException("Unknown payload type " + payload.getType());
+            }
         }
     }
 
@@ -96,7 +99,7 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
         }
     }
 
-    private void updatePubkey(BitmessageAddress address, Pubkey pubkey){
+    private void updatePubkey(BitmessageAddress address, Pubkey pubkey) {
         address.setPubkey(pubkey);
         LOG.info("Got pubkey for contact " + address);
         ctx.getAddressRepository().save(address);
diff --git a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
index bfd4f30..33ee15b 100644
--- a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
@@ -20,6 +20,7 @@ import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.Encrypted;
 import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.payload.*;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.ports.*;
 import ch.dissem.bitmessage.utils.Singleton;
 import ch.dissem.bitmessage.utils.TTL;
@@ -187,7 +188,7 @@ public class InternalContext {
             messageCallback.proofOfWorkStarted(payload);
             proofOfWorkService.doProofOfWork(to, object);
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
@@ -206,7 +207,7 @@ public class InternalContext {
             // TODO: remember that the pubkey is just about to be sent, and on which stream!
             proofOfWorkService.doProofOfWork(response);
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
index 8790d3a..5e8552e 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
@@ -16,6 +16,7 @@
 
 package ch.dissem.bitmessage.entity;
 
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.utils.Encode;
 
 import java.io.ByteArrayOutputStream;
@@ -84,7 +85,7 @@ public class NetworkMessage implements Streamable {
         try {
             out.write(getChecksum(payloadBytes));
         } catch (GeneralSecurityException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
 
         // message payload
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
index 99b3aec..3425c63 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
@@ -191,9 +191,6 @@ public class ObjectMessage implements MessagePayload {
         private long streamNumber;
         private ObjectPayload payload;
 
-        public Builder() {
-        }
-
         public Builder nonce(byte[] nonce) {
             this.nonce = nonce;
             return this;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
index 794ae44..da99350 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
@@ -17,6 +17,7 @@
 package ch.dissem.bitmessage.entity.valueobject;
 
 import ch.dissem.bitmessage.entity.Streamable;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.utils.Encode;
 import ch.dissem.bitmessage.utils.UnixTime;
 
@@ -85,7 +86,7 @@ public class NetworkAddress implements Streamable {
         try {
             return InetAddress.getByAddress(ipv6);
         } catch (UnknownHostException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/exception/ApplicationException.java b/core/src/main/java/ch/dissem/bitmessage/exception/ApplicationException.java
new file mode 100644
index 0000000..998284d
--- /dev/null
+++ b/core/src/main/java/ch/dissem/bitmessage/exception/ApplicationException.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.exception;
+
+/**
+ * @author Christian Basler
+ */
+public class ApplicationException extends RuntimeException {
+    public ApplicationException(Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java b/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
index 1bcb8e7..5d8777a 100644
--- a/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
@@ -111,6 +111,7 @@ public class SerializationTest extends TestBase {
         before.write(out);
 
         NetworkMessage after = Factory.getNetworkMessage(3, new ByteArrayInputStream(out.toByteArray()));
+        assertNotNull(after);
         Inv invAfter = (Inv) after.getPayload();
         assertEquals(ivs, invAfter.getInventory());
     }
diff --git a/cryptography-bc/src/test/java/ch/dissem/bitmessage/security/CryptographyTest.java b/cryptography-bc/src/test/java/ch/dissem/bitmessage/security/CryptographyTest.java
index ef3fcbf..3e5695c 100644
--- a/cryptography-bc/src/test/java/ch/dissem/bitmessage/security/CryptographyTest.java
+++ b/cryptography-bc/src/test/java/ch/dissem/bitmessage/security/CryptographyTest.java
@@ -5,6 +5,7 @@ import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.payload.GenericPayload;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
+import ch.dissem.bitmessage.exception.InsufficientProofOfWorkException;
 import ch.dissem.bitmessage.ports.MultiThreadedPOWEngine;
 import ch.dissem.bitmessage.ports.ProofOfWorkEngine;
 import ch.dissem.bitmessage.utils.CallbackWaiter;
@@ -22,6 +23,7 @@ import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertThat;
+import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -102,7 +104,11 @@ public class CryptographyTest {
                     }
                 });
         objectMessage.setNonce(waiter.waitForValue());
-        crypto.checkProofOfWork(objectMessage, 1000, 1000);
+        try {
+            crypto.checkProofOfWork(objectMessage, 1000, 1000);
+        } catch (InsufficientProofOfWorkException e) {
+            fail(e.getMessage());
+        }
     }
 
     @Test
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
index 54bfee4..fef1d32 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
@@ -114,7 +114,7 @@ class Connection {
 
     public static Connection sync(InternalContext ctx, InetAddress address, int port, MessageListener listener,
                                   long timeoutInSeconds) throws IOException {
-        return new Connection(ctx, Mode.SYNC, listener, new Socket(address, port),
+        return new Connection(ctx, SYNC, listener, new Socket(address, port),
                 new HashSet<InventoryVector>(),
                 new HashSet<InventoryVector>(),
                 new NetworkAddress.Builder().ip(address).port(port).stream(1).build(),
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
index d3bec17..f69af2c 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
@@ -171,6 +171,8 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
                                             case ACTIVE:
                                                 active++;
                                                 break;
+                                            default:
+                                                // nothing to do
                                         }
                                     }
                                 }
diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index a45ec47..2e63e3a 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -52,30 +52,30 @@ public class NetworkHandlerTest {
     public static void setUp() {
         peerInventory = new TestInventory();
         peer = new BitmessageContext.Builder()
-                .addressRepo(Mockito.mock(AddressRepository.class))
+                .addressRepo(mock(AddressRepository.class))
                 .inventory(peerInventory)
-                .messageRepo(Mockito.mock(MessageRepository.class))
-                .powRepo(Mockito.mock(ProofOfWorkRepository.class))
+                .messageRepo(mock(MessageRepository.class))
+                .powRepo(mock(ProofOfWorkRepository.class))
                 .port(6001)
                 .nodeRegistry(new TestNodeRegistry())
                 .networkHandler(new DefaultNetworkHandler())
                 .cryptography(new BouncyCryptography())
-                .listener(Mockito.mock(BitmessageContext.Listener.class))
+                .listener(mock(BitmessageContext.Listener.class))
                 .build();
         peer.startup();
 
         nodeInventory = new TestInventory();
         networkHandler = new DefaultNetworkHandler();
         node = new BitmessageContext.Builder()
-                .addressRepo(Mockito.mock(AddressRepository.class))
+                .addressRepo(mock(AddressRepository.class))
                 .inventory(nodeInventory)
-                .messageRepo(Mockito.mock(MessageRepository.class))
-                .powRepo(Mockito.mock(ProofOfWorkRepository.class))
+                .messageRepo(mock(MessageRepository.class))
+                .powRepo(mock(ProofOfWorkRepository.class))
                 .port(6002)
                 .nodeRegistry(new TestNodeRegistry(localhost))
                 .networkHandler(networkHandler)
                 .cryptography(new BouncyCryptography())
-                .listener(Mockito.mock(BitmessageContext.Listener.class))
+                .listener(mock(BitmessageContext.Listener.class))
                 .build();
     }
 
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java
index 3336475..aa41e5c 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java
@@ -19,6 +19,7 @@ package ch.dissem.bitmessage.repository;
 import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.payload.ObjectType;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.Inventory;
 import org.slf4j.Logger;
@@ -99,7 +100,7 @@ public class JdbcInventory extends JdbcHelper implements Inventory {
             }
         } catch (Exception e) {
             LOG.error(e.getMessage(), e);
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
@@ -126,7 +127,7 @@ public class JdbcInventory extends JdbcHelper implements Inventory {
             return result;
         } catch (Exception e) {
             LOG.error(e.getMessage(), e);
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 

From 9f1e0057c9666d39bd48654a5ed322e15d02f546 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 24 Feb 2016 23:10:04 +0100
Subject: [PATCH 15/87] Code cleanup

---
 .../java/ch/dissem/bitmessage/BitmessageContext.java     | 5 +++--
 .../ch/dissem/bitmessage/DefaultMessageListener.java     | 2 +-
 .../java/ch/dissem/bitmessage/entity/CustomMessage.java  | 7 ++++---
 .../main/java/ch/dissem/bitmessage/entity/Plaintext.java | 9 +++++----
 .../dissem/bitmessage/entity/valueobject/PrivateKey.java | 3 ++-
 .../bitmessage/exception/ApplicationException.java       | 4 ++++
 .../java/ch/dissem/bitmessage/ports/SimplePOWEngine.java | 3 ++-
 .../ch/dissem/bitmessage/ProofOfWorkServiceTest.java     | 3 +--
 .../bitmessage/extensions/CryptoCustomMessage.java       | 5 +++--
 .../java/ch/dissem/bitmessage/networking/Connection.java | 1 +
 .../bitmessage/repository/JdbcMessageRepository.java     | 9 +++++----
 .../main/java/ch/dissem/bitmessage/wif/WifExporter.java  | 3 ++-
 12 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 94cf3c3..f54a8f9 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -25,6 +25,7 @@ import ch.dissem.bitmessage.entity.payload.Pubkey.Feature;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.*;
@@ -119,7 +120,7 @@ public class BitmessageContext {
 
     public void addDistributedMailingList(String address, String alias) {
         // TODO
-        throw new RuntimeException("not implemented");
+        throw new ApplicationException("not implemented");
     }
 
     public void broadcast(final BitmessageAddress from, final String subject, final String message) {
@@ -187,7 +188,7 @@ public class BitmessageContext {
             case BROADCAST:
                 return Factory.getBroadcast(msg);
             default:
-                throw new RuntimeException("Unknown message type " + msg.getType());
+                throw new ApplicationException("Unknown message type " + msg.getType());
         }
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
index dcc62b9..d209974 100644
--- a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
+++ b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
@@ -103,7 +103,7 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
         address.setPubkey(pubkey);
         LOG.info("Got pubkey for contact " + address);
         ctx.getAddressRepository().save(address);
-        List<Plaintext> messages = ctx.getMessageRepository().findMessages(Plaintext.Status.PUBKEY_REQUESTED, address);
+        List<Plaintext> messages = ctx.getMessageRepository().findMessages(PUBKEY_REQUESTED, address);
         LOG.info("Sending " + messages.size() + " messages for contact " + address);
         for (Plaintext msg : messages) {
             msg.setStatus(DOING_PROOF_OF_WORK);
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java
index 5702b6e..ffdb9b2 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java
@@ -16,6 +16,7 @@
 
 package ch.dissem.bitmessage.entity;
 
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.utils.AccessCounter;
 import ch.dissem.bitmessage.utils.Encode;
 
@@ -66,7 +67,7 @@ public class CustomMessage implements MessagePayload {
                 write(out);
                 return out.toByteArray();
             } catch (IOException e) {
-                throw new RuntimeException(e);
+                throw new ApplicationException(e);
             }
         }
     }
@@ -77,7 +78,7 @@ public class CustomMessage implements MessagePayload {
             Encode.varString(command, out);
             out.write(data);
         } else {
-            throw new RuntimeException("Tried to write custom message without data. " +
+            throw new ApplicationException("Tried to write custom message without data. " +
                     "Programmer: did you forget to override #write()?");
         }
     }
@@ -90,7 +91,7 @@ public class CustomMessage implements MessagePayload {
         try {
             return new CustomMessage(COMMAND_ERROR, message.getBytes("UTF-8"));
         } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
index fc38c65..fe8b1d3 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
@@ -18,6 +18,7 @@ package ch.dissem.bitmessage.entity;
 
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.Label;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.utils.Decode;
 import ch.dissem.bitmessage.utils.Encode;
@@ -111,9 +112,9 @@ public class Plaintext implements Streamable {
 
     public void setTo(BitmessageAddress to) {
         if (this.to.getVersion() != 0)
-            throw new RuntimeException("Correct address already set");
+            throw new IllegalStateException("Correct address already set");
         if (!Arrays.equals(this.to.getRipe(), to.getRipe())) {
-            throw new RuntimeException("RIPEs don't match");
+            throw new IllegalArgumentException("RIPEs don't match");
         }
         this.to = to;
     }
@@ -223,7 +224,7 @@ public class Plaintext implements Streamable {
             }
             return text;
         } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
@@ -402,7 +403,7 @@ public class Plaintext implements Streamable {
                 this.encoding = Encoding.SIMPLE.getCode();
                 this.message = ("Subject:" + subject + '\n' + "Body:" + message).getBytes("UTF-8");
             } catch (UnsupportedEncodingException e) {
-                throw new RuntimeException(e);
+                throw new ApplicationException(e);
             }
             return this;
         }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
index d07c859..e058308 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
@@ -18,6 +18,7 @@ package ch.dissem.bitmessage.entity.valueobject;
 
 import ch.dissem.bitmessage.entity.Streamable;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.utils.Bytes;
 import ch.dissem.bitmessage.utils.Decode;
@@ -71,7 +72,7 @@ public class PrivateKey implements Streamable {
             this.pubkey = security().createPubkey(version, stream, privateSigningKey, privateEncryptionKey,
                     nonceTrialsPerByte, extraBytes, features);
         } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/exception/ApplicationException.java b/core/src/main/java/ch/dissem/bitmessage/exception/ApplicationException.java
index 998284d..c381410 100644
--- a/core/src/main/java/ch/dissem/bitmessage/exception/ApplicationException.java
+++ b/core/src/main/java/ch/dissem/bitmessage/exception/ApplicationException.java
@@ -23,4 +23,8 @@ public class ApplicationException extends RuntimeException {
     public ApplicationException(Throwable cause) {
         super(cause);
     }
+
+    public ApplicationException(String message) {
+        super(message);
+    }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/SimplePOWEngine.java b/core/src/main/java/ch/dissem/bitmessage/ports/SimplePOWEngine.java
index e8d649b..4fa1116 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/SimplePOWEngine.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/SimplePOWEngine.java
@@ -16,6 +16,7 @@
 
 package ch.dissem.bitmessage.ports;
 
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.utils.Bytes;
 
 import java.security.MessageDigest;
@@ -37,7 +38,7 @@ public class SimplePOWEngine implements ProofOfWorkEngine {
         try {
             mda = MessageDigest.getInstance("SHA-512");
         } catch (Exception e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
         do {
             inc(nonce);
diff --git a/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java b/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
index eb5d368..e489e35 100644
--- a/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
@@ -20,12 +20,10 @@ import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.Plaintext;
-import ch.dissem.bitmessage.entity.payload.GetPubkey;
 import ch.dissem.bitmessage.entity.payload.Msg;
 import ch.dissem.bitmessage.ports.*;
 import ch.dissem.bitmessage.utils.Singleton;
 import ch.dissem.bitmessage.utils.TestUtils;
-import org.hamcrest.CoreMatchers;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
@@ -39,6 +37,7 @@ import static org.junit.Assert.assertThat;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.anyLong;
 import static org.mockito.Mockito.*;
 
 /**
diff --git a/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java b/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java
index 49c6f1b..eb2c4e7 100644
--- a/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java
+++ b/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java
@@ -21,6 +21,7 @@ import ch.dissem.bitmessage.entity.CustomMessage;
 import ch.dissem.bitmessage.entity.Streamable;
 import ch.dissem.bitmessage.entity.payload.CryptoBox;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.utils.Encode;
@@ -134,9 +135,9 @@ public class CryptoCustomMessage<T extends Streamable> extends CustomMessage {
             return read;
         }
 
-        public void checkSignature(Pubkey pubkey) throws IOException, RuntimeException {
+        public void checkSignature(Pubkey pubkey) throws IOException, IllegalStateException {
             if (!security().isSignatureValid(out.toByteArray(), varBytes(wrapped), pubkey)) {
-                throw new RuntimeException("Signature check failed");
+                throw new IllegalStateException("Signature check failed");
             }
         }
     }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
index fef1d32..f24736f 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
@@ -252,6 +252,7 @@ class Connection {
             case CUSTOM:
             case VERACK:
             case VERSION:
+            default:
                 throw new RuntimeException("Unexpectedly received '" + messagePayload.getCommand() + "' command");
         }
     }
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
index 69890c3..c01e147 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
@@ -21,6 +21,7 @@ import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.Label;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.ports.MessageRepository;
 import ch.dissem.bitmessage.utils.Strings;
 import org.slf4j.Logger;
@@ -53,7 +54,7 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
                 result.add(getLabel(rs));
             }
         } catch (SQLException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
         return result;
     }
@@ -118,7 +119,7 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
             case 1:
                 return plaintexts.get(0);
             default:
-                throw new RuntimeException("This shouldn't happen, found " + plaintexts.size() +
+                throw new ApplicationException("This shouldn't happen, found " + plaintexts.size() +
                         " messages, one or none was expected");
         }
     }
@@ -225,10 +226,10 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
                 } catch (SQLException e1) {
                     LOG.debug(e1.getMessage(), e);
                 }
-                throw new RuntimeException(e);
+                throw new ApplicationException(e);
             }
         } catch (SQLException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
diff --git a/wif/src/main/java/ch/dissem/bitmessage/wif/WifExporter.java b/wif/src/main/java/ch/dissem/bitmessage/wif/WifExporter.java
index b41d645..00f2790 100644
--- a/wif/src/main/java/ch/dissem/bitmessage/wif/WifExporter.java
+++ b/wif/src/main/java/ch/dissem/bitmessage/wif/WifExporter.java
@@ -18,6 +18,7 @@ package ch.dissem.bitmessage.wif;
 
 import ch.dissem.bitmessage.BitmessageContext;
 import ch.dissem.bitmessage.entity.BitmessageAddress;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.utils.Base58;
 import org.ini4j.Ini;
 import org.ini4j.Profile;
@@ -95,7 +96,7 @@ public class WifExporter {
         try {
             ini.store(writer);
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
         return writer.toString();
     }

From 0a00a0a1b444ea9a4d824edfaff6c03c7218fada Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 24 Feb 2016 23:25:55 +0100
Subject: [PATCH 16/87] Code cleanup

---
 .../dissem/bitmessage/BitmessageContext.java  |  1 -
 .../bitmessage/entity/BitmessageAddress.java  |  7 ++++---
 .../bitmessage/entity/ObjectMessage.java      |  7 ++++---
 .../ports/AbstractCryptography.java           |  5 +++--
 .../bitmessage/ports/MemoryNodeRegistry.java  |  3 ++-
 .../ports/MultiThreadedPOWEngine.java         |  5 +++--
 .../ch/dissem/bitmessage/utils/Base58.java    | 20 +++++++++----------
 .../extensions/CryptoCustomMessage.java       |  1 -
 8 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index f54a8f9..9344b41 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -22,7 +22,6 @@ import ch.dissem.bitmessage.entity.payload.Msg;
 import ch.dissem.bitmessage.entity.payload.ObjectPayload;
 import ch.dissem.bitmessage.entity.payload.ObjectType;
 import ch.dissem.bitmessage.entity.payload.Pubkey.Feature;
-import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
 import ch.dissem.bitmessage.exception.ApplicationException;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
index 931776c..632bd70 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
@@ -19,6 +19,7 @@ package ch.dissem.bitmessage.entity;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.payload.V4Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.utils.AccessCounter;
 import ch.dissem.bitmessage.utils.Base58;
 import ch.dissem.bitmessage.utils.Bytes;
@@ -83,7 +84,7 @@ public class BitmessageAddress implements Serializable {
             os.write(checksum, 0, 4);
             this.address = "BM-" + Base58.encode(os.toByteArray());
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
@@ -124,7 +125,7 @@ public class BitmessageAddress implements Serializable {
                 this.publicDecryptionKey = Arrays.copyOfRange(checksum, 0, 32);
             }
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
@@ -136,7 +137,7 @@ public class BitmessageAddress implements Serializable {
             out.write(ripe);
             return Arrays.copyOfRange(security().doubleSha512(out.toByteArray()), 32, 64);
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
index 3425c63..a24bf6b 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
@@ -21,6 +21,7 @@ import ch.dissem.bitmessage.entity.payload.ObjectType;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
 import ch.dissem.bitmessage.utils.Bytes;
 import ch.dissem.bitmessage.utils.Encode;
@@ -110,7 +111,7 @@ public class ObjectMessage implements MessagePayload {
             payload.writeBytesToSign(out);
             return out.toByteArray();
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
@@ -144,7 +145,7 @@ public class ObjectMessage implements MessagePayload {
                 ((Encrypted) payload).encrypt(publicKey.getEncryptionKey());
             }
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
@@ -180,7 +181,7 @@ public class ObjectMessage implements MessagePayload {
             }
             return payloadBytes;
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java b/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
index 3cf3f0d..81252d5 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
@@ -19,6 +19,7 @@ package ch.dissem.bitmessage.ports;
 import ch.dissem.bitmessage.InternalContext;
 import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.InsufficientProofOfWorkException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.utils.Bytes;
@@ -151,7 +152,7 @@ public abstract class AbstractCryptography implements Cryptography, InternalCont
         try {
             return MessageDigest.getInstance(algorithm, provider);
         } catch (GeneralSecurityException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
@@ -161,7 +162,7 @@ public abstract class AbstractCryptography implements Cryptography, InternalCont
             mac.init(new SecretKeySpec(key_m, "HmacSHA256"));
             return mac.doFinal(data);
         } catch (GeneralSecurityException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java b/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
index 8d43423..c68a474 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
@@ -17,6 +17,7 @@
 package ch.dissem.bitmessage.ports;
 
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.utils.UnixTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,7 +72,7 @@ public class MemoryNodeRegistry implements NodeRegistry {
                 }
             }
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/MultiThreadedPOWEngine.java b/core/src/main/java/ch/dissem/bitmessage/ports/MultiThreadedPOWEngine.java
index 790e3b7..50164a3 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/MultiThreadedPOWEngine.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/MultiThreadedPOWEngine.java
@@ -16,6 +16,7 @@
 
 package ch.dissem.bitmessage.ports;
 
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.utils.Bytes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49,7 +50,7 @@ public class MultiThreadedPOWEngine implements ProofOfWorkEngine {
         try {
             semaphore.acquire();
         } catch (InterruptedException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
         callback = new CallbackWrapper(callback);
         int cores = Runtime.getRuntime().availableProcessors();
@@ -88,7 +89,7 @@ public class MultiThreadedPOWEngine implements ProofOfWorkEngine {
                 mda = MessageDigest.getInstance("SHA-512");
             } catch (NoSuchAlgorithmException e) {
                 LOG.error(e.getMessage(), e);
-                throw new RuntimeException(e);
+                throw new ApplicationException(e);
             }
         }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/utils/Base58.java b/core/src/main/java/ch/dissem/bitmessage/utils/Base58.java
index ec2476a..9f35fb7 100644
--- a/core/src/main/java/ch/dissem/bitmessage/utils/Base58.java
+++ b/core/src/main/java/ch/dissem/bitmessage/utils/Base58.java
@@ -44,27 +44,27 @@ public class Base58 {
     /**
      * Encodes the given bytes in base58. No checksum is appended.
      *
-     * @param input to encode
+     * @param data to encode
      * @return base58 encoded input
      */
-    public static String encode(byte[] input) {
-        if (input.length == 0) {
+    public static String encode(byte[] data) {
+        if (data.length == 0) {
             return "";
         }
-        input = copyOfRange(input, 0, input.length);
+        final byte[] bytes = copyOfRange(data, 0, data.length);
         // Count leading zeroes.
         int zeroCount = 0;
-        while (zeroCount < input.length && input[zeroCount] == 0) {
+        while (zeroCount < bytes.length && bytes[zeroCount] == 0) {
             ++zeroCount;
         }
         // The actual encoding.
-        byte[] temp = new byte[input.length * 2];
+        byte[] temp = new byte[bytes.length * 2];
         int j = temp.length;
 
         int startAt = zeroCount;
-        while (startAt < input.length) {
-            byte mod = divmod58(input, startAt);
-            if (input[startAt] == 0) {
+        while (startAt < bytes.length) {
+            byte mod = divmod58(bytes, startAt);
+            if (bytes[startAt] == 0) {
                 ++startAt;
             }
             temp[--j] = (byte) ALPHABET[mod];
@@ -97,7 +97,7 @@ public class Base58 {
             char c = input.charAt(i);
 
             int digit58 = -1;
-            if (c >= 0 && c < 128) {
+            if (c < 128) {
                 digit58 = INDEXES[c];
             }
             if (digit58 < 0) {
diff --git a/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java b/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java
index eb2c4e7..33c7524 100644
--- a/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java
+++ b/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java
@@ -21,7 +21,6 @@ import ch.dissem.bitmessage.entity.CustomMessage;
 import ch.dissem.bitmessage.entity.Streamable;
 import ch.dissem.bitmessage.entity.payload.CryptoBox;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
-import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.utils.Encode;

From f6add5b2ea8e9168b1ef467b9a8af8896504d6ae Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Thu, 25 Feb 2016 16:36:43 +0100
Subject: [PATCH 17/87] Code cleanup

---
 .../dissem/bitmessage/BitmessageContext.java  |  3 +-
 .../bitmessage/entity/payload/CryptoBox.java  |  3 +-
 .../ch/dissem/bitmessage/utils/Base58.java    |  3 +-
 .../bitmessage/BitmessageContextTest.java     |  3 +-
 .../entity/BitmessageAddressTest.java         | 56 ++++++++++---------
 .../cryptography/bc/BouncyCryptography.java   | 10 ++--
 .../cryptography/sc/SpongyCryptography.java   | 10 ++--
 .../java/ch/dissem/bitmessage/SystemTest.java | 12 ++--
 .../bitmessage/networking/Connection.java     |  6 +-
 .../networking/DefaultNetworkHandler.java     |  7 ++-
 .../repository/JdbcAddressRepository.java     |  7 ++-
 .../repository/JdbcProofOfWorkRepository.java | 17 +++---
 12 files changed, 80 insertions(+), 57 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 9344b41..60b7267 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -416,7 +416,8 @@ public class BitmessageContext {
                 customCommandHandler = new CustomCommandHandler() {
                     @Override
                     public MessagePayload handle(CustomMessage request) {
-                        throw new RuntimeException("Received custom request, but no custom command handler configured.");
+                        throw new IllegalStateException(
+                                "Received custom request, but no custom command handler configured.");
                     }
                 };
             }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
index 3d1c926..8887fea 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
@@ -17,6 +17,7 @@
 package ch.dissem.bitmessage.entity.payload;
 
 import ch.dissem.bitmessage.entity.Streamable;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
 import ch.dissem.bitmessage.utils.*;
 import org.slf4j.Logger;
@@ -123,7 +124,7 @@ public class CryptoBox implements Streamable {
             writeWithoutMAC(macData);
             return security().mac(key_m, macData.toByteArray());
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/utils/Base58.java b/core/src/main/java/ch/dissem/bitmessage/utils/Base58.java
index 9f35fb7..167d862 100644
--- a/core/src/main/java/ch/dissem/bitmessage/utils/Base58.java
+++ b/core/src/main/java/ch/dissem/bitmessage/utils/Base58.java
@@ -18,6 +18,7 @@
 package ch.dissem.bitmessage.utils;
 
 import ch.dissem.bitmessage.exception.AddressFormatException;
+import ch.dissem.bitmessage.exception.ApplicationException;
 
 import java.io.UnsupportedEncodingException;
 
@@ -83,7 +84,7 @@ public class Base58 {
         try {
             return new String(output, "US-ASCII");
         } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);  // Cannot happen.
+            throw new ApplicationException(e);  // Cannot happen.
         }
     }
 
diff --git a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
index 828e794..890c2c3 100644
--- a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
@@ -194,7 +194,8 @@ public class BitmessageContextTest {
                 .putObject(object(BROADCAST), eq(1000L), eq(1000L));
         verify(ctx.internals().getProofOfWorkEngine())
                 .calculateNonce(any(byte[].class), any(byte[].class), any(ProofOfWorkEngine.Callback.class));
-        verify(ctx.messages(), timeout(10000).atLeastOnce()).save(MessageMatchers.plaintext(Plaintext.Type.BROADCAST));
+        verify(ctx.messages(), timeout(10000).atLeastOnce())
+                .save(MessageMatchers.plaintext(Plaintext.Type.BROADCAST));
     }
 
     @Test(expected = IllegalArgumentException.class)
diff --git a/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java b/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
index e1fcc7f..495aea9 100644
--- a/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
@@ -55,44 +55,56 @@ public class BitmessageAddressTest {
     }
 
     @Test
-    public void testCreateAddress() {
+    public void ensureIdentityCanBeCreated() {
         BitmessageAddress address = new BitmessageAddress(new PrivateKey(false, 1, 1000, 1000, DOES_ACK));
         assertNotNull(address.getPubkey());
     }
 
     @Test
-    public void testV2PubkeyImport() throws IOException {
+    public void ensureV2PubkeyCanBeImported() throws IOException {
         ObjectMessage object = TestUtils.loadObjectMessage(2, "V2Pubkey.payload");
         Pubkey pubkey = (Pubkey) object.getPayload();
         BitmessageAddress address = new BitmessageAddress("BM-opWQhvk9xtMFvQA2Kvetedpk8LkbraWHT");
-        address.setPubkey(pubkey);
+        try {
+            address.setPubkey(pubkey);
+        } catch (Exception e) {
+            fail(e.getMessage());
+        }
     }
 
     @Test
-    public void testV3PubkeyImport() throws IOException {
+    public void ensureV3PubkeyCanBeImported() throws IOException {
         BitmessageAddress address = new BitmessageAddress("BM-2D9Vc5rFxxR5vTi53T9gkLfemViHRMVLQZ");
         assertArrayEquals(Bytes.fromHex("007402be6e76c3cb87caa946d0c003a3d4d8e1d5"), address.getRipe());
 
         ObjectMessage object = TestUtils.loadObjectMessage(3, "V3Pubkey.payload");
         Pubkey pubkey = (Pubkey) object.getPayload();
         assertTrue(object.isSignatureValid(pubkey));
-        address.setPubkey(pubkey);
+        try {
+            address.setPubkey(pubkey);
+        } catch (Exception e) {
+            fail(e.getMessage());
+        }
 
         assertArrayEquals(Bytes.fromHex("007402be6e76c3cb87caa946d0c003a3d4d8e1d5"), pubkey.getRipe());
     }
 
     @Test
-    public void testV4PubkeyImport() throws IOException, DecryptionFailedException {
+    public void ensureV4PubkeyCanBeImported() throws IOException, DecryptionFailedException {
         BitmessageAddress address = new BitmessageAddress("BM-2cXxfcSetKnbHJX2Y85rSkaVpsdNUZ5q9h");
         ObjectMessage object = TestUtils.loadObjectMessage(4, "V4Pubkey.payload");
         object.decrypt(address.getPublicDecryptionKey());
         V4Pubkey pubkey = (V4Pubkey) object.getPayload();
         assertTrue(object.isSignatureValid(pubkey));
-        address.setPubkey(pubkey);
+        try {
+            address.setPubkey(pubkey);
+        } catch (Exception e) {
+            fail(e.getMessage());
+        }
     }
 
     @Test
-    public void testV3AddressImport() throws IOException {
+    public void ensureV3IdentityCanBeImported() throws IOException {
         String address_string = "BM-2DAjcCFrqFrp88FUxExhJ9kPqHdunQmiyn";
         assertEquals(3, new BitmessageAddress(address_string).getVersion());
         assertEquals(1, new BitmessageAddress(address_string).getStream());
@@ -108,9 +120,17 @@ public class BitmessageAddressTest {
     }
 
     @Test
-    public void testGetSecret() throws IOException {
-        assertHexEquals("0C28FCA386C7A227600B2FE50B7CAE11EC86D3BF1FBE471BE89827E19D72AA1D",
-                getSecret("5HueCGU8rMjxEXxiPuD5BDku4MkFqeZyd4dZ1jvhTVqvbTLvyTJ"));
+    public void ensureV4IdentityCanBeImported() throws IOException {
+        assertEquals(4, new BitmessageAddress("BM-2cV5f9EpzaYARxtoruSpa6pDoucSf9ZNke").getVersion());
+        byte[] privsigningkey = getSecret("5KMWqfCyJZGFgW6QrnPJ6L9Gatz25B51y7ErgqNr1nXUVbtZbdU");
+        byte[] privencryptionkey = getSecret("5JXXWEuhHQEPk414SzEZk1PHDRi8kCuZd895J7EnKeQSahJPxGz");
+        BitmessageAddress address = new BitmessageAddress(new PrivateKey(privsigningkey, privencryptionkey,
+                security().createPubkey(4, 1, privsigningkey, privencryptionkey, 320, 14000)));
+        assertEquals("BM-2cV5f9EpzaYARxtoruSpa6pDoucSf9ZNke", address.getAddress());
+    }
+
+    private void assertHexEquals(String hex, byte[] bytes) {
+        assertEquals(hex.toLowerCase(), Strings.hex(bytes).toString().toLowerCase());
     }
 
     private byte[] getSecret(String walletImportFormat) throws IOException {
@@ -126,18 +146,4 @@ public class BitmessageAddressTest {
         }
         return Arrays.copyOfRange(bytes, 1, 33);
     }
-
-    @Test
-    public void testV4AddressImport() throws IOException {
-        assertEquals(4, new BitmessageAddress("BM-2cV5f9EpzaYARxtoruSpa6pDoucSf9ZNke").getVersion());
-        byte[] privsigningkey = getSecret("5KMWqfCyJZGFgW6QrnPJ6L9Gatz25B51y7ErgqNr1nXUVbtZbdU");
-        byte[] privencryptionkey = getSecret("5JXXWEuhHQEPk414SzEZk1PHDRi8kCuZd895J7EnKeQSahJPxGz");
-        BitmessageAddress address = new BitmessageAddress(new PrivateKey(privsigningkey, privencryptionkey,
-                security().createPubkey(4, 1, privsigningkey, privencryptionkey, 320, 14000)));
-        assertEquals("BM-2cV5f9EpzaYARxtoruSpa6pDoucSf9ZNke", address.getAddress());
-    }
-
-    private void assertHexEquals(String hex, byte[] bytes) {
-        assertEquals(hex.toLowerCase(), Strings.hex(bytes).toString().toLowerCase());
-    }
 }
diff --git a/cryptography-bc/src/main/java/ch/dissem/bitmessage/cryptography/bc/BouncyCryptography.java b/cryptography-bc/src/main/java/ch/dissem/bitmessage/cryptography/bc/BouncyCryptography.java
index 28be67a..41e2c37 100644
--- a/cryptography-bc/src/main/java/ch/dissem/bitmessage/cryptography/bc/BouncyCryptography.java
+++ b/cryptography-bc/src/main/java/ch/dissem/bitmessage/cryptography/bc/BouncyCryptography.java
@@ -18,6 +18,7 @@ package ch.dissem.bitmessage.cryptography.bc;
 
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.ports.AbstractCryptography;
 import org.bouncycastle.asn1.x9.X9ECParameters;
 import org.bouncycastle.crypto.BufferedBlockCipher;
@@ -37,6 +38,7 @@ import org.bouncycastle.jce.spec.ECPublicKeySpec;
 import org.bouncycastle.math.ec.ECPoint;
 
 import java.math.BigInteger;
+import java.security.GeneralSecurityException;
 import java.security.KeyFactory;
 import java.security.PublicKey;
 import java.security.Signature;
@@ -109,8 +111,8 @@ public class BouncyCryptography extends AbstractCryptography {
             sig.initVerify(publicKey);
             sig.update(data);
             return sig.verify(signature);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+        } catch (GeneralSecurityException e) {
+            throw new ApplicationException(e);
         }
     }
 
@@ -133,8 +135,8 @@ public class BouncyCryptography extends AbstractCryptography {
             sig.initSign(privKey);
             sig.update(data);
             return sig.sign();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+        } catch (GeneralSecurityException e) {
+            throw new ApplicationException(e);
         }
     }
 
diff --git a/cryptography-sc/src/main/java/ch/dissem/bitmessage/cryptography/sc/SpongyCryptography.java b/cryptography-sc/src/main/java/ch/dissem/bitmessage/cryptography/sc/SpongyCryptography.java
index c9506fb..066ca10 100644
--- a/cryptography-sc/src/main/java/ch/dissem/bitmessage/cryptography/sc/SpongyCryptography.java
+++ b/cryptography-sc/src/main/java/ch/dissem/bitmessage/cryptography/sc/SpongyCryptography.java
@@ -18,6 +18,7 @@ package ch.dissem.bitmessage.cryptography.sc;
 
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.ports.AbstractCryptography;
 import org.spongycastle.asn1.x9.X9ECParameters;
 import org.spongycastle.crypto.BufferedBlockCipher;
@@ -37,6 +38,7 @@ import org.spongycastle.jce.spec.ECPublicKeySpec;
 import org.spongycastle.math.ec.ECPoint;
 
 import java.math.BigInteger;
+import java.security.GeneralSecurityException;
 import java.security.KeyFactory;
 import java.security.PublicKey;
 import java.security.Signature;
@@ -109,8 +111,8 @@ public class SpongyCryptography extends AbstractCryptography {
             sig.initVerify(publicKey);
             sig.update(data);
             return sig.verify(signature);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+        } catch (GeneralSecurityException e) {
+            throw new ApplicationException(e);
         }
     }
 
@@ -133,8 +135,8 @@ public class SpongyCryptography extends AbstractCryptography {
             sig.initSign(privKey);
             sig.update(data);
             return sig.sign();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+        } catch (GeneralSecurityException e) {
+            throw new ApplicationException(e);
         }
     }
 
diff --git a/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java b/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
index a2e3da7..06b6628 100644
--- a/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
+++ b/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
@@ -19,6 +19,8 @@ import static org.junit.Assert.assertThat;
  * @author Christian Basler
  */
 public class SystemTest {
+    private static int port = 6000;
+
     private BitmessageContext alice;
     private TestListener aliceListener = new TestListener();
     private BitmessageAddress aliceIdentity;
@@ -29,6 +31,8 @@ public class SystemTest {
 
     @Before
     public void setUp() {
+        int alicePort = port++;
+        int bobPort = port++;
         TTL.msg(5 * MINUTE);
         TTL.getpubkey(5 * MINUTE);
         TTL.pubkey(5 * MINUTE);
@@ -38,8 +42,8 @@ public class SystemTest {
                 .inventory(new JdbcInventory(aliceDB))
                 .messageRepo(new JdbcMessageRepository(aliceDB))
                 .powRepo(new JdbcProofOfWorkRepository(aliceDB))
-                .port(6001)
-                .nodeRegistry(new TestNodeRegistry(6002))
+                .port(alicePort)
+                .nodeRegistry(new TestNodeRegistry(bobPort))
                 .networkHandler(new DefaultNetworkHandler())
                 .cryptography(new BouncyCryptography())
                 .listener(aliceListener)
@@ -53,8 +57,8 @@ public class SystemTest {
                 .inventory(new JdbcInventory(bobDB))
                 .messageRepo(new JdbcMessageRepository(bobDB))
                 .powRepo(new JdbcProofOfWorkRepository(bobDB))
-                .port(6002)
-                .nodeRegistry(new TestNodeRegistry(6001))
+                .port(bobPort)
+                .nodeRegistry(new TestNodeRegistry(alicePort))
                 .networkHandler(new DefaultNetworkHandler())
                 .cryptography(new BouncyCryptography())
                 .listener(bobListener)
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
index f24736f..4f99144 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
@@ -21,6 +21,7 @@ import ch.dissem.bitmessage.InternalContext;
 import ch.dissem.bitmessage.entity.*;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.InsufficientProofOfWorkException;
 import ch.dissem.bitmessage.exception.NodeException;
 import ch.dissem.bitmessage.factory.Factory;
@@ -253,7 +254,7 @@ class Connection {
             case VERACK:
             case VERSION:
             default:
-                throw new RuntimeException("Unexpectedly received '" + messagePayload.getCommand() + "' command");
+                throw new IllegalStateException("Unexpectedly received '" + messagePayload.getCommand() + "' command");
         }
     }
 
@@ -386,6 +387,8 @@ class Connection {
                                                 case SYNC:
                                                     activateConnection();
                                                     break;
+                                                default:
+                                                    // NO OP
                                             }
                                         } else {
                                             LOG.info("Received unsupported version " + payload.getVersion() + ", disconnecting.");
@@ -399,6 +402,7 @@ class Connection {
                                                 break;
                                             case CLIENT:
                                             case SYNC:
+                                            default:
                                                 // NO OP
                                                 break;
                                         }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
index f69af2c..44dd437 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
@@ -23,6 +23,7 @@ import ch.dissem.bitmessage.entity.GetData;
 import ch.dissem.bitmessage.entity.NetworkMessage;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.NodeException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.NetworkHandler;
@@ -85,7 +86,7 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
             pool.execute(connection.getWriter());
             return reader;
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
@@ -106,7 +107,7 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
                 }
             }
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
@@ -209,7 +210,7 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
                 }
             });
         } catch (IOException e) {
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java
index bf15a6a..6e58f09 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java
@@ -21,12 +21,12 @@ import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.payload.V3Pubkey;
 import ch.dissem.bitmessage.entity.payload.V4Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.AddressRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -129,8 +129,9 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
         try (Connection connection = config.getConnection()) {
             Statement stmt = connection.createStatement();
             ResultSet rs = stmt.executeQuery("SELECT COUNT(*) FROM Address WHERE address='" + address.getAddress() + "'");
-            rs.next();
-            return rs.getInt(1) > 0;
+            if (rs.next()) {
+                return rs.getInt(1) > 0;
+            }
         } catch (SQLException e) {
             LOG.error(e.getMessage(), e);
         }
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java
index 9268311..37628b5 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java
@@ -1,12 +1,14 @@
 package ch.dissem.bitmessage.repository;
 
 import ch.dissem.bitmessage.entity.ObjectMessage;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.ProofOfWorkRepository;
 import ch.dissem.bitmessage.utils.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
 import java.sql.*;
 import java.util.LinkedList;
 import java.util.List;
@@ -37,11 +39,11 @@ public class JdbcProofOfWorkRepository extends JdbcHelper implements ProofOfWork
                         rs.getLong("extra_bytes")
                 );
             } else {
-                throw new RuntimeException("Object requested that we don't have. Initial hash: " + Strings.hex(initialHash));
+                throw new IllegalArgumentException("Object requested that we don't have. Initial hash: " + Strings.hex(initialHash));
             }
-        } catch (Exception e) {
+        } catch (SQLException e) {
             LOG.error(e.getMessage(), e);
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
@@ -57,7 +59,7 @@ public class JdbcProofOfWorkRepository extends JdbcHelper implements ProofOfWork
             return result;
         } catch (SQLException e) {
             LOG.error(e.getMessage(), e);
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 
@@ -71,12 +73,9 @@ public class JdbcProofOfWorkRepository extends JdbcHelper implements ProofOfWork
             ps.setLong(4, nonceTrialsPerByte);
             ps.setLong(5, extraBytes);
             ps.executeUpdate();
-        } catch (SQLException e) {
+        } catch (IOException | SQLException e) {
             LOG.debug("Error storing object of type " + object.getPayload().getClass().getSimpleName(), e);
-            throw new RuntimeException(e);
-        } catch (Exception e) {
-            LOG.error(e.getMessage(), e);
-            throw new RuntimeException(e);
+            throw new ApplicationException(e);
         }
     }
 

From 382cb80a87b7ad8e5864af78b59f0308ebf1f35f Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 26 Feb 2016 14:01:26 +0100
Subject: [PATCH 18/87] Updated badges

---
 README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c682e0b..6c44558 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ Jabit
 =====
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/ch.dissem.jabit/jabit-core)
 [![Javadoc](https://javadoc-emblem.rhcloud.com/doc/ch.dissem.jabit/jabit-core/badge.svg)](http://www.javadoc.io/doc/ch.dissem.jabit/jabit-core)
-[![GitHub license](https://img.shields.io/github/license/Dissem/Jabit.svg)](https://raw.githubusercontent.com/Dissem/Jabit/master/LICENSE)
+[![Apache 2](https://img.shields.io/badge/license-Apache_2.0-blue.svg)](https://raw.githubusercontent.com/Dissem/Jabit/master/LICENSE)
 [![Visit our IRC channel](https://img.shields.io/badge/irc-%23jabit-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/#jabit)
 
 A Java implementation for the Bitmessage protocol. To build, use command `gradle build` or `./gradlew build`.
@@ -11,10 +11,14 @@ Please note that it still has its limitations, but the API should now be stable.
 as long as the major version doesn't change, nothing should break if you update.
 
 #### Master
-[![Build Status](https://travis-ci.org/Dissem/Jabit.svg?branch=master)](https://travis-ci.org/Dissem/Jabit) [![codecov.io](https://codecov.io/github/Dissem/Jabit/coverage.svg?branch=master)](https://codecov.io/github/Dissem/Jabit?branch=master)
+[![Build Status](https://travis-ci.org/Dissem/Jabit.svg?branch=master)](https://travis-ci.org/Dissem/Jabit) 
+[![Code Quality](https://img.shields.io/codacy/e9938d2adbb74a0db553115bef692ff3/master.svg)](https://www.codacy.com/app/chrigu-meyer/Jabit/dashboard?bid=3144281)
+[![Test Coverage](https://codecov.io/github/Dissem/Jabit/coverage.svg?branch=master)](https://codecov.io/github/Dissem/Jabit?branch=master)
 
 #### Develop
-[![Build Status](https://travis-ci.org/Dissem/Jabit.svg?branch=develop)](https://travis-ci.org/Dissem/Jabit?branch=develop) [![codecov.io](https://codecov.io/github/Dissem/Jabit/coverage.svg?branch=develop)](https://codecov.io/github/Dissem/Jabit?branch=develop)
+[![Build Status](https://travis-ci.org/Dissem/Jabit.svg?branch=develop)](https://travis-ci.org/Dissem/Jabit?branch=develop) 
+[![Code Quality](https://img.shields.io/codacy/e9938d2adbb74a0db553115bef692ff3/develop.svg)](https://www.codacy.com/app/chrigu-meyer/Jabit/dashboard?bid=3144279)
+[![Test Coverage](https://codecov.io/github/Dissem/Jabit/coverage.svg?branch=develop)](https://codecov.io/github/Dissem/Jabit?branch=develop)
 
 Security
 --------

From bc68a5d3ec89ee053afc123cca0decc264aba02c Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 26 Feb 2016 14:34:08 +0100
Subject: [PATCH 19/87] Code cleanup & improvements - most notably removed some
 unnecessary synchronize blocks in the DefaultNetworkHandler

---
 .../dissem/bitmessage/BitmessageContext.java  |   3 -
 .../ch/dissem/bitmessage/entity/Addr.java     |   3 -
 .../bitmessage/entity/BitmessageAddress.java  |   2 +-
 .../ch/dissem/bitmessage/entity/GetData.java  |   5 +-
 .../java/ch/dissem/bitmessage/entity/Inv.java |   3 -
 .../bitmessage/entity/ObjectMessage.java      |   6 +-
 .../ch/dissem/bitmessage/entity/Version.java  |   3 -
 .../bitmessage/entity/payload/V2Pubkey.java   |   3 -
 .../bitmessage/entity/payload/V3Pubkey.java   |   3 -
 .../entity/valueobject/NetworkAddress.java    |   3 -
 .../bitmessage/ports/SimplePOWEngine.java     |  20 +-
 .../dissem/bitmessage/demo/Application.java   |   8 +-
 .../bitmessage/networking/Connection.java     |   1 -
 .../networking/ConnectionOrganizer.java       | 120 ++++++++++
 .../networking/DefaultNetworkHandler.java     | 220 +++++-------------
 .../bitmessage/networking/ServerRunnable.java |  70 ++++++
 .../repository/JdbcAddressRepository.java     |   8 +-
 .../bitmessage/repository/JdbcHelper.java     |   6 +-
 .../repository/JdbcMessageRepository.java     |  16 +-
 19 files changed, 286 insertions(+), 217 deletions(-)
 create mode 100644 networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
 create mode 100644 networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 60b7267..9f03926 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -302,9 +302,6 @@ public class BitmessageContext {
         long connectionTTL = 30 * MINUTE;
         boolean sendPubkeyOnIdentityCreation = true;
 
-        public Builder() {
-        }
-
         public Builder port(int port) {
             this.port = port;
             return this;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Addr.java b/core/src/main/java/ch/dissem/bitmessage/entity/Addr.java
index d00623e..2c0eb3e 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Addr.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Addr.java
@@ -55,9 +55,6 @@ public class Addr implements MessagePayload {
     public static final class Builder {
         private List<NetworkAddress> addresses = new ArrayList<NetworkAddress>();
 
-        public Builder() {
-        }
-
         public Builder addresses(Collection<NetworkAddress> addresses){
             this.addresses.addAll(addresses);
             return this;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
index 632bd70..62fabc3 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
@@ -188,7 +188,7 @@ public class BitmessageAddress implements Serializable {
 
     @Override
     public String toString() {
-        return alias != null ? alias : address;
+        return alias == null ? address : alias;
     }
 
     public byte[] getRipe() {
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/GetData.java b/core/src/main/java/ch/dissem/bitmessage/entity/GetData.java
index e272bbc..9569929 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/GetData.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/GetData.java
@@ -28,6 +28,8 @@ import java.util.List;
  * The 'getdata' command is used to request objects from a node.
  */
 public class GetData implements MessagePayload {
+    public static final int MAX_INVENTORY_SIZE = 50_000;
+
     List<InventoryVector> inventory;
 
     private GetData(Builder builder) {
@@ -54,9 +56,6 @@ public class GetData implements MessagePayload {
     public static final class Builder {
         private List<InventoryVector> inventory = new LinkedList<>();
 
-        public Builder() {
-        }
-
         public Builder addInventoryVector(InventoryVector inventoryVector) {
             this.inventory.add(inventoryVector);
             return this;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Inv.java b/core/src/main/java/ch/dissem/bitmessage/entity/Inv.java
index 0135ec0..7130fd7 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Inv.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Inv.java
@@ -54,9 +54,6 @@ public class Inv implements MessagePayload {
     public static final class Builder {
         private List<InventoryVector> inventory = new LinkedList<>();
 
-        public Builder() {
-        }
-
         public Builder addInventoryVector(InventoryVector inventoryVector) {
             this.inventory.add(inventoryVector);
             return this;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
index a24bf6b..89ddddb 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
@@ -156,10 +156,10 @@ public class ObjectMessage implements MessagePayload {
 
     @Override
     public void write(OutputStream out) throws IOException {
-        if (nonce != null) {
-            out.write(nonce);
-        } else {
+        if (nonce == null) {
             out.write(new byte[8]);
+        } else {
+            out.write(nonce);
         }
         out.write(getPayloadBytesWithoutNonce());
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Version.java b/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
index 70c2ad2..6d24d92 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
@@ -143,9 +143,6 @@ public class Version implements MessagePayload {
         private String userAgent;
         private long[] streamNumbers;
 
-        public Builder() {
-        }
-
         public Builder defaults() {
             version = BitmessageContext.CURRENT_VERSION;
             services = 1;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java
index da16929..d915941 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java
@@ -96,9 +96,6 @@ public class V2Pubkey extends Pubkey {
         private byte[] publicSigningKey;
         private byte[] publicEncryptionKey;
 
-        public Builder() {
-        }
-
         public Builder stream(long streamNumber) {
             this.streamNumber = streamNumber;
             return this;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V3Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V3Pubkey.java
index bf91afe..a3b4da2 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V3Pubkey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V3Pubkey.java
@@ -123,9 +123,6 @@ public class V3Pubkey extends V2Pubkey {
         private long extraBytes;
         private byte[] signature = new byte[0];
 
-        public Builder() {
-        }
-
         public Builder stream(long streamNumber) {
             this.streamNumber = streamNumber;
             return this;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
index da99350..0637da9 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
@@ -134,9 +134,6 @@ public class NetworkAddress implements Streamable {
         private byte[] ipv6;
         private int port;
 
-        public Builder() {
-        }
-
         public Builder time(final long time) {
             this.time = time;
             return this;
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/SimplePOWEngine.java b/core/src/main/java/ch/dissem/bitmessage/ports/SimplePOWEngine.java
index 4fa1116..a7d0d57 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/SimplePOWEngine.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/SimplePOWEngine.java
@@ -20,6 +20,7 @@ import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.utils.Bytes;
 
 import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 
 import static ch.dissem.bitmessage.utils.Bytes.inc;
 
@@ -33,18 +34,17 @@ import static ch.dissem.bitmessage.utils.Bytes.inc;
 public class SimplePOWEngine implements ProofOfWorkEngine {
     @Override
     public void calculateNonce(byte[] initialHash, byte[] target, Callback callback) {
-        byte[] nonce = new byte[8];
-        MessageDigest mda;
         try {
-            mda = MessageDigest.getInstance("SHA-512");
-        } catch (Exception e) {
+            MessageDigest mda = MessageDigest.getInstance("SHA-512");
+            byte[] nonce = new byte[8];
+            do {
+                inc(nonce);
+                mda.update(nonce);
+                mda.update(initialHash);
+            } while (Bytes.lt(target, mda.digest(mda.digest()), 8));
+            callback.onNonceCalculated(initialHash, nonce);
+        } catch (NoSuchAlgorithmException e) {
             throw new ApplicationException(e);
         }
-        do {
-            inc(nonce);
-            mda.update(nonce);
-            mda.update(initialHash);
-        } while (Bytes.lt(target, mda.digest(mda.digest()), 8));
-        callback.onNonceCalculated(initialHash, nonce);
     }
 }
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
index 26d6652..dab43f3 100644
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
@@ -289,18 +289,18 @@ public class Application {
         System.out.println("Stream:  " + address.getStream());
         System.out.println("Version: " + address.getVersion());
         if (address.getPrivateKey() == null) {
-            if (address.getPubkey() != null) {
-                System.out.println("Public key available");
-            } else {
+            if (address.getPubkey() == null) {
                 System.out.println("Public key still missing");
+            } else {
+                System.out.println("Public key available");
             }
         }
     }
 
     private void messages() {
         String command;
-        List<Plaintext> messages = ctx.messages().findMessages(Plaintext.Status.RECEIVED);
         do {
+            List<Plaintext> messages = ctx.messages().findMessages(Plaintext.Status.RECEIVED);
             System.out.println();
             int i = 0;
             for (Plaintext message : messages) {
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
index 4f99144..43f1e30 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
@@ -21,7 +21,6 @@ import ch.dissem.bitmessage.InternalContext;
 import ch.dissem.bitmessage.entity.*;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
-import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.InsufficientProofOfWorkException;
 import ch.dissem.bitmessage.exception.NodeException;
 import ch.dissem.bitmessage.factory.Factory;
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java b/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
new file mode 100644
index 0000000..3f667e6
--- /dev/null
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.networking;
+
+import ch.dissem.bitmessage.InternalContext;
+import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
+import ch.dissem.bitmessage.ports.NetworkHandler;
+import ch.dissem.bitmessage.utils.UnixTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Iterator;
+import java.util.List;
+
+import static ch.dissem.bitmessage.networking.Connection.Mode.CLIENT;
+import static ch.dissem.bitmessage.networking.DefaultNetworkHandler.NETWORK_MAGIC_NUMBER;
+
+/**
+ * @author Christian Basler
+ */
+public class ConnectionOrganizer implements Runnable {
+    private static final Logger LOG = LoggerFactory.getLogger(ConnectionOrganizer.class);
+
+    private final InternalContext ctx;
+    private final DefaultNetworkHandler networkHandler;
+    private final NetworkHandler.MessageListener listener;
+
+    private Connection initialConnection;
+
+    public ConnectionOrganizer(InternalContext ctx,
+                               DefaultNetworkHandler networkHandler,
+                               NetworkHandler.MessageListener listener) {
+        this.ctx = ctx;
+        this.networkHandler = networkHandler;
+        this.listener = listener;
+    }
+
+    @Override
+    public void run() {
+        try {
+            while (networkHandler.isRunning()) {
+                try {
+                    int active = 0;
+                    long now = UnixTime.now();
+
+                    int diff = networkHandler.connections.size() - ctx.getConnectionLimit();
+                    if (diff > 0) {
+                        for (Connection c : networkHandler.connections) {
+                            c.disconnect();
+                            diff--;
+                            if (diff == 0) break;
+                        }
+                    }
+                    boolean forcedDisconnect = false;
+                    for (Iterator<Connection> iterator = networkHandler.connections.iterator(); iterator.hasNext(); ) {
+                        Connection c = iterator.next();
+                        // Just in case they were all created at the same time, don't disconnect
+                        // all at once.
+                        if (!forcedDisconnect && now - c.getStartTime() > ctx.getConnectionTTL()) {
+                            c.disconnect();
+                            forcedDisconnect = true;
+                        }
+                        switch (c.getState()) {
+                            case DISCONNECTED:
+                                iterator.remove();
+                                break;
+                            case ACTIVE:
+                                active++;
+                                break;
+                            default:
+                                // nothing to do
+                        }
+                    }
+
+                    if (active < NETWORK_MAGIC_NUMBER) {
+                        List<NetworkAddress> addresses = ctx.getNodeRegistry().getKnownAddresses(
+                                NETWORK_MAGIC_NUMBER - active, ctx.getStreams());
+                        boolean first = active == 0 && initialConnection == null;
+                        for (NetworkAddress address : addresses) {
+                            Connection c = new Connection(ctx, CLIENT, address, listener, networkHandler.requestedObjects);
+                            if (first) {
+                                initialConnection = c;
+                                first = false;
+                            }
+                            networkHandler.startConnection(c);
+                        }
+                        Thread.sleep(10000);
+                    } else if (initialConnection != null) {
+                        initialConnection.disconnect();
+                        initialConnection = null;
+                        Thread.sleep(10000);
+                    } else {
+                        Thread.sleep(30000);
+                    }
+                } catch (InterruptedException e) {
+                    networkHandler.stop();
+                } catch (Exception e) {
+                    LOG.error("Error in connection manager. Ignored.", e);
+                }
+            }
+        } finally {
+            LOG.debug("Connection manager shutting down.");
+            networkHandler.stop();
+        }
+    }
+}
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
index 44dd437..43333ac 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
@@ -22,25 +22,21 @@ import ch.dissem.bitmessage.entity.CustomMessage;
 import ch.dissem.bitmessage.entity.GetData;
 import ch.dissem.bitmessage.entity.NetworkMessage;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
-import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
 import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.NodeException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.NetworkHandler;
 import ch.dissem.bitmessage.utils.Collections;
 import ch.dissem.bitmessage.utils.Property;
-import ch.dissem.bitmessage.utils.UnixTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.net.InetAddress;
-import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static ch.dissem.bitmessage.networking.Connection.Mode.CLIENT;
 import static ch.dissem.bitmessage.networking.Connection.Mode.SERVER;
 import static ch.dissem.bitmessage.networking.Connection.State.ACTIVE;
 import static ch.dissem.bitmessage.utils.DebugUtils.inc;
@@ -54,13 +50,13 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
 
     public final static int NETWORK_MAGIC_NUMBER = 8;
 
-    private final Collection<Connection> connections = new ConcurrentLinkedQueue<>();
+    final Collection<Connection> connections = new ConcurrentLinkedQueue<>();
     private final ExecutorService pool;
     private InternalContext ctx;
-    private ServerSocket serverSocket;
+    private ServerRunnable server;
     private volatile boolean running;
 
-    private Set<InventoryVector> requestedObjects = newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(50_000));
+    final Set<InventoryVector> requestedObjects = newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(50_000));
 
     public DefaultNetworkHandler() {
         pool = Executors.newCachedThreadPool(new ThreadFactory() {
@@ -122,93 +118,9 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
         try {
             running = true;
             connections.clear();
-            serverSocket = new ServerSocket(ctx.getPort());
-            pool.execute(new Runnable() {
-                @Override
-                public void run() {
-                    while (!serverSocket.isClosed()) {
-                        try {
-                            Socket socket = serverSocket.accept();
-                            socket.setSoTimeout(Connection.READ_TIMEOUT);
-                            startConnection(new Connection(ctx, SERVER, socket, listener, requestedObjects));
-                        } catch (IOException e) {
-                            LOG.debug(e.getMessage(), e);
-                        }
-                    }
-                }
-            });
-            pool.execute(new Runnable() {
-                public Connection initialConnection;
-
-                @Override
-                public void run() {
-                    try {
-                        while (running) {
-                            try {
-                                int active = 0;
-                                long now = UnixTime.now();
-                                synchronized (connections) {
-                                    int diff = connections.size() - ctx.getConnectionLimit();
-                                    if (diff > 0) {
-                                        for (Connection c : connections) {
-                                            c.disconnect();
-                                            diff--;
-                                            if (diff == 0) break;
-                                        }
-                                    }
-                                    boolean forcedDisconnect = false;
-                                    for (Iterator<Connection> iterator = connections.iterator(); iterator.hasNext(); ) {
-                                        Connection c = iterator.next();
-                                        // Just in case they were all created at the same time, don't disconnect
-                                        // all at once.
-                                        if (!forcedDisconnect && now - c.getStartTime() > ctx.getConnectionTTL()) {
-                                            c.disconnect();
-                                            forcedDisconnect = true;
-                                        }
-                                        switch (c.getState()) {
-                                            case DISCONNECTED:
-                                                iterator.remove();
-                                                break;
-                                            case ACTIVE:
-                                                active++;
-                                                break;
-                                            default:
-                                                // nothing to do
-                                        }
-                                    }
-                                }
-                                if (active < NETWORK_MAGIC_NUMBER) {
-                                    List<NetworkAddress> addresses = ctx.getNodeRegistry().getKnownAddresses(
-                                            NETWORK_MAGIC_NUMBER - active, ctx.getStreams());
-                                    boolean first = active == 0 && initialConnection == null;
-                                    for (NetworkAddress address : addresses) {
-                                        Connection c = new Connection(ctx, CLIENT, address, listener, requestedObjects);
-                                        if (first) {
-                                            initialConnection = c;
-                                            first = false;
-                                        }
-                                        startConnection(c);
-                                    }
-                                    Thread.sleep(10000);
-                                } else if (initialConnection != null) {
-                                    initialConnection.disconnect();
-                                    initialConnection = null;
-                                    Thread.sleep(10000);
-                                } else {
-                                    Thread.sleep(30000);
-                                }
-                            } catch (InterruptedException e) {
-                                running = false;
-                            } catch (Exception e) {
-                                LOG.error("Error in connection manager. Ignored.", e);
-                            }
-                        }
-                    } finally {
-                        LOG.debug("Connection manager shutting down.");
-                        running = false;
-                    }
-                }
-            });
+            server = new ServerRunnable(ctx, this, listener);
+            pool.execute(server);
+            pool.execute(new ConnectionOrganizer(ctx, this, listener));
         } catch (IOException e) {
             throw new ApplicationException(e);
         }
@@ -221,13 +133,9 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
 
     @Override
     public void stop() {
-        running = false;
-        try {
-            serverSocket.close();
-        } catch (IOException e) {
-            LOG.debug(e.getMessage(), e);
-        }
+        server.close();
         synchronized (connections) {
+            running = false;
             for (Connection c : connections) {
                 c.disconnect();
             }
@@ -235,8 +143,12 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
         requestedObjects.clear();
     }
 
-    private void startConnection(Connection c) {
+    void startConnection(Connection c) {
+        if (!running) return;
+
         synchronized (connections) {
+            if (!running) return;
+
             // prevent connecting twice to the same node
             if (connections.contains(c)) {
                 return;
@@ -250,11 +162,9 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
     @Override
     public void offer(final InventoryVector iv) {
         List<Connection> target = new LinkedList<>();
-        synchronized (connections) {
-            for (Connection connection : connections) {
-                if (connection.getState() == ACTIVE && !connection.knowsOf(iv)) {
-                    target.add(connection);
-                }
+        for (Connection connection : connections) {
+            if (connection.getState() == ACTIVE && !connection.knowsOf(iv)) {
+                target.add(connection);
             }
         }
         List<Connection> randomSubset = Collections.selectRandom(NETWORK_MAGIC_NUMBER, target);
@@ -269,16 +179,14 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
         TreeMap<Long, Integer> incomingConnections = new TreeMap<>();
         TreeMap<Long, Integer> outgoingConnections = new TreeMap<>();
 
-        synchronized (connections) {
-            for (Connection connection : connections) {
-                if (connection.getState() == ACTIVE) {
-                    long stream = connection.getNode().getStream();
-                    streams.add(stream);
-                    if (connection.getMode() == SERVER) {
-                        inc(incomingConnections, stream);
-                    } else {
-                        inc(outgoingConnections, stream);
-                    }
+        for (Connection connection : connections) {
+            if (connection.getState() == ACTIVE) {
+                long stream = connection.getNode().getStream();
+                streams.add(stream);
+                if (connection.getMode() == SERVER) {
+                    inc(incomingConnections, stream);
+                } else {
+                    inc(outgoingConnections, stream);
                 }
             }
         }
@@ -303,53 +211,47 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
 
     void request(Set<InventoryVector> inventoryVectors) {
         if (!running || inventoryVectors.isEmpty()) return;
-        synchronized (connections) {
-            Map<Connection, List<InventoryVector>> distribution = new HashMap<>();
-            for (Connection connection : connections) {
-                if (connection.getState() == ACTIVE) {
-                    distribution.put(connection, new LinkedList<InventoryVector>());
-                }
-            }
-            Iterator<InventoryVector> iterator = inventoryVectors.iterator();
-            InventoryVector next;
-            if (iterator.hasNext()) {
-                next = iterator.next();
-            } else {
-                return;
-            }
-            boolean firstRound = true;
-            while (firstRound || iterator.hasNext()) {
-                if (!firstRound) {
-                    next = iterator.next();
-                    firstRound = true;
-                } else {
-                    firstRound = false;
-                }
-                for (Connection connection : distribution.keySet()) {
-                    if (connection.knowsOf(next)) {
-                        List<InventoryVector> ivs = distribution.get(connection);
-                        if (ivs.size() == 50_000) {
-                            connection.send(new GetData.Builder().inventory(ivs).build());
-                            ivs.clear();
-                        }
-                        ivs.add(next);
-                        iterator.remove();
 
-                        if (iterator.hasNext()) {
-                            next = iterator.next();
-                            firstRound = true;
-                        } else {
-                            firstRound = false;
-                            break;
-                        }
+        Map<Connection, List<InventoryVector>> distribution = new HashMap<>();
+        for (Connection connection : connections) {
+            if (connection.getState() == ACTIVE) {
+                distribution.put(connection, new LinkedList<InventoryVector>());
+            }
+        }
+        Iterator<InventoryVector> iterator = inventoryVectors.iterator();
+        if (!iterator.hasNext()) {
+            return;
+        }
+        InventoryVector next = iterator.next();
+        Connection previous = null;
+        do {
+            for (Connection connection : distribution.keySet()) {
+                if (connection == previous) {
+                    next = iterator.next();
+                }
+                if (connection.knowsOf(next)) {
+                    List<InventoryVector> ivs = distribution.get(connection);
+                    if (ivs.size() == GetData.MAX_INVENTORY_SIZE) {
+                        connection.send(new GetData.Builder().inventory(ivs).build());
+                        ivs.clear();
+                    }
+                    ivs.add(next);
+                    iterator.remove();
+
+                    if (iterator.hasNext()) {
+                        next = iterator.next();
+                        previous = connection;
+                    } else {
+                        break;
                     }
                 }
             }
-            for (Connection connection : distribution.keySet()) {
-                List<InventoryVector> ivs = distribution.get(connection);
-                if (!ivs.isEmpty()) {
-                    connection.send(new GetData.Builder().inventory(ivs).build());
-                }
+        } while (iterator.hasNext());
+
+        for (Connection connection : distribution.keySet()) {
+            List<InventoryVector> ivs = distribution.get(connection);
+            if (!ivs.isEmpty()) {
+                connection.send(new GetData.Builder().inventory(ivs).build());
             }
         }
     }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java b/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java
new file mode 100644
index 0000000..bf6d6f6
--- /dev/null
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.networking;
+
+import ch.dissem.bitmessage.InternalContext;
+import ch.dissem.bitmessage.ports.NetworkHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+import static ch.dissem.bitmessage.networking.Connection.Mode.SERVER;
+
+/**
+ * @author Christian Basler
+ */
+public class ServerRunnable implements Runnable, Closeable {
+    private static final Logger LOG = LoggerFactory.getLogger(ServerRunnable.class);
+    private final InternalContext ctx;
+    private final ServerSocket serverSocket;
+    private final DefaultNetworkHandler networkHandler;
+    private final NetworkHandler.MessageListener listener;
+
+    public ServerRunnable(InternalContext ctx, DefaultNetworkHandler networkHandler, NetworkHandler.MessageListener listener) throws IOException {
+        this.ctx = ctx;
+        this.networkHandler = networkHandler;
+        this.listener = listener;
+        this.serverSocket = new ServerSocket(ctx.getPort());
+    }
+
+    @Override
+    public void run() {
+        while (!serverSocket.isClosed()) {
+            try {
+                Socket socket = serverSocket.accept();
+                socket.setSoTimeout(Connection.READ_TIMEOUT);
+                networkHandler.startConnection(new Connection(ctx, SERVER, socket, listener,
+                        networkHandler.requestedObjects));
+            } catch (IOException e) {
+                LOG.debug(e.getMessage(), e);
+            }
+        }
+    }
+
+    @Override
+    public void close() {
+        try {
+            serverSocket.close();
+        } catch (IOException e) {
+            LOG.debug(e.getMessage(), e);
+        }
+    }
+}
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java
index 6e58f09..97202d1 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java
@@ -99,10 +99,7 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
                 BitmessageAddress address;
 
                 InputStream privateKeyStream = rs.getBinaryStream("private_key");
-                if (privateKeyStream != null) {
-                    PrivateKey privateKey = PrivateKey.read(privateKeyStream);
-                    address = new BitmessageAddress(privateKey);
-                } else {
+                if (privateKeyStream == null) {
                     address = new BitmessageAddress(rs.getString("address"));
                     Blob publicKeyBlob = rs.getBlob("public_key");
                     if (publicKeyBlob != null) {
@@ -113,6 +110,9 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
                         }
                         address.setPubkey(pubkey);
                     }
+                } else {
+                    PrivateKey privateKey = PrivateKey.read(privateKeyStream);
+                    address = new BitmessageAddress(privateKey);
                 }
                 address.setAlias(rs.getString("alias"));
                 address.setSubscribed(rs.getBoolean("subscribed"));
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcHelper.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcHelper.java
index d583a71..1df12f6 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcHelper.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcHelper.java
@@ -77,12 +77,12 @@ public abstract class JdbcHelper {
     }
 
     protected void writeBlob(PreparedStatement ps, int parameterIndex, Streamable data) throws SQLException, IOException {
-        if (data != null) {
+        if (data == null) {
+            ps.setBytes(parameterIndex, null);
+        } else {
             ByteArrayOutputStream os = new ByteArrayOutputStream();
             data.write(os);
             ps.setBytes(parameterIndex, os.toByteArray());
-        } else {
-            ps.setBytes(parameterIndex, null);
         }
     }
 }
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
index c01e147..d77cdfb 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
@@ -90,10 +90,10 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
     @Override
     public int countUnread(Label label) {
         String where;
-        if (label != null) {
-            where = "id IN (SELECT message_id FROM Message_Label WHERE label_id=" + label.getId() + ") AND ";
-        } else {
+        if (label == null) {
             where = "";
+        } else {
+            where = "id IN (SELECT message_id FROM Message_Label WHERE label_id=" + label.getId() + ") AND ";
         }
         where += "id IN (SELECT message_id FROM Message_Label WHERE label_id IN (" +
                 "SELECT id FROM Label WHERE type = '" + Label.Type.UNREAD.name() + "'))";
@@ -237,14 +237,14 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
         PreparedStatement ps = connection.prepareStatement(
                 "INSERT INTO Message (iv, type, sender, recipient, data, sent, received, status, initial_hash) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
                 Statement.RETURN_GENERATED_KEYS);
-        ps.setBytes(1, message.getInventoryVector() != null ? message.getInventoryVector().getHash() : null);
+        ps.setBytes(1, message.getInventoryVector() == null ? null : message.getInventoryVector().getHash());
         ps.setString(2, message.getType().name());
         ps.setString(3, message.getFrom().getAddress());
-        ps.setString(4, message.getTo() != null ? message.getTo().getAddress() : null);
+        ps.setString(4, message.getTo() == null ? null : message.getTo().getAddress());
         writeBlob(ps, 5, message);
         ps.setLong(6, message.getSent());
         ps.setLong(7, message.getReceived());
-        ps.setString(8, message.getStatus() != null ? message.getStatus().name() : null);
+        ps.setString(8, message.getStatus() == null ? null : message.getStatus().name());
         ps.setBytes(9, message.getInitialHash());
 
         ps.executeUpdate();
@@ -258,10 +258,10 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
     private void update(Connection connection, Plaintext message) throws SQLException, IOException {
         PreparedStatement ps = connection.prepareStatement(
                 "UPDATE Message SET iv=?, sent=?, received=?, status=?, initial_hash=? WHERE id=?");
-        ps.setBytes(1, message.getInventoryVector() != null ? message.getInventoryVector().getHash() : null);
+        ps.setBytes(1, message.getInventoryVector() == null ? null : message.getInventoryVector().getHash());
         ps.setLong(2, message.getSent());
         ps.setLong(3, message.getReceived());
-        ps.setString(4, message.getStatus() != null ? message.getStatus().name() : null);
+        ps.setString(4, message.getStatus() == null ? null : message.getStatus().name());
         ps.setBytes(5, message.getInitialHash());
         ps.setLong(6, (Long) message.getId());
         ps.executeUpdate();

From 2a17e6024f34d7ab0a7d09c7ef072caab9b43c5d Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 26 Feb 2016 15:06:47 +0100
Subject: [PATCH 20/87] Code cleanup

---
 .../ch/dissem/bitmessage/utils/Strings.java   |   2 -
 .../ch/dissem/bitmessage/SignatureTest.java   |   2 -
 .../networking/ConnectionOrganizer.java       |   6 +-
 .../repository/JdbcMessageRepository.java     | 125 ++++++++++--------
 .../ch/dissem/bitmessage/wif/WifImporter.java |   4 -
 5 files changed, 73 insertions(+), 66 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/utils/Strings.java b/core/src/main/java/ch/dissem/bitmessage/utils/Strings.java
index 5c1aae9..7c9e13f 100644
--- a/core/src/main/java/ch/dissem/bitmessage/utils/Strings.java
+++ b/core/src/main/java/ch/dissem/bitmessage/utils/Strings.java
@@ -16,8 +16,6 @@
 
 package ch.dissem.bitmessage.utils;
 
-import ch.dissem.bitmessage.entity.payload.ObjectType;
-
 /**
  * Some utilities to handle strings.
  * TODO: Probably this should be split in a GUI related and an SQL related utility class.
diff --git a/core/src/test/java/ch/dissem/bitmessage/SignatureTest.java b/core/src/test/java/ch/dissem/bitmessage/SignatureTest.java
index 71b7d2a..3566a5f 100644
--- a/core/src/test/java/ch/dissem/bitmessage/SignatureTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/SignatureTest.java
@@ -22,7 +22,6 @@ import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.payload.Msg;
 import ch.dissem.bitmessage.entity.payload.ObjectType;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
-import ch.dissem.bitmessage.entity.payload.V4Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
 import ch.dissem.bitmessage.utils.TestBase;
@@ -30,7 +29,6 @@ import ch.dissem.bitmessage.utils.TestUtils;
 import org.junit.Test;
 
 import java.io.IOException;
-import java.util.Date;
 
 import static org.junit.Assert.*;
 
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java b/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
index 3f667e6..1163d1c 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
@@ -99,12 +99,12 @@ public class ConnectionOrganizer implements Runnable {
                             networkHandler.startConnection(c);
                         }
                         Thread.sleep(10000);
-                    } else if (initialConnection != null) {
+                    } else if (initialConnection == null) {
+                        Thread.sleep(30000);
+                    } else {
                         initialConnection.disconnect();
                         initialConnection = null;
                         Thread.sleep(10000);
-                    } else {
-                        Thread.sleep(30000);
                     }
                 } catch (InterruptedException e) {
                     networkHandler.stop();
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
index d77cdfb..1d714d9 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
@@ -47,9 +47,11 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
     @Override
     public List<Label> getLabels() {
         List<Label> result = new LinkedList<>();
-        try (Connection connection = config.getConnection()) {
-            Statement stmt = connection.createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT id, label, type, color FROM Label ORDER BY ord");
+        try (
+                Connection connection = config.getConnection();
+                Statement stmt = connection.createStatement();
+                ResultSet rs = stmt.executeQuery("SELECT id, label, type, color FROM Label ORDER BY ord")
+        ) {
             while (rs.next()) {
                 result.add(getLabel(rs));
             }
@@ -74,10 +76,12 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
     @Override
     public List<Label> getLabels(Label.Type... types) {
         List<Label> result = new LinkedList<>();
-        try (Connection connection = config.getConnection()) {
-            Statement stmt = connection.createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT id, label, type, color FROM Label WHERE type IN (" + join(types) +
-                    ") ORDER BY ord");
+        try (
+                Connection connection = config.getConnection();
+                Statement stmt = connection.createStatement();
+                ResultSet rs = stmt.executeQuery("SELECT id, label, type, color FROM Label WHERE type IN (" + join(types) +
+                        ") ORDER BY ord")
+        ) {
             while (rs.next()) {
                 result.add(getLabel(rs));
             }
@@ -98,9 +102,11 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
         where += "id IN (SELECT message_id FROM Message_Label WHERE label_id IN (" +
                 "SELECT id FROM Label WHERE type = '" + Label.Type.UNREAD.name() + "'))";
 
-        try (Connection connection = config.getConnection()) {
-            Statement stmt = connection.createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT count(*) FROM Message WHERE " + where);
+        try (
+                Connection connection = config.getConnection();
+                Statement stmt = connection.createStatement();
+                ResultSet rs = stmt.executeQuery("SELECT count(*) FROM Message WHERE " + where)
+        ) {
             if (rs.next()) {
                 return rs.getInt(1);
             }
@@ -146,9 +152,12 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
 
     private List<Plaintext> find(String where) {
         List<Plaintext> result = new LinkedList<>();
-        try (Connection connection = config.getConnection()) {
-            Statement stmt = connection.createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT id, iv, type, sender, recipient, data, sent, received, status FROM Message WHERE " + where);
+        try (
+                Connection connection = config.getConnection();
+                Statement stmt = connection.createStatement();
+                ResultSet rs = stmt.executeQuery("SELECT id, iv, type, sender, recipient, data, sent, received, status " +
+                        "FROM Message WHERE " + where)
+        ) {
             while (rs.next()) {
                 byte[] iv = rs.getBytes("iv");
                 InputStream data = rs.getBinaryStream("data");
@@ -173,9 +182,11 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
 
     private Collection<Label> findLabels(Connection connection, long messageId) {
         List<Label> result = new ArrayList<>();
-        try {
-            Statement stmt = connection.createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT id, label, type, color FROM Label WHERE id IN (SELECT label_id FROM Message_Label WHERE message_id=" + messageId + ")");
+        try (
+                Statement stmt = connection.createStatement();
+                ResultSet rs = stmt.executeQuery("SELECT id, label, type, color FROM Label " +
+                        "WHERE id IN (SELECT label_id FROM Message_Label WHERE message_id=" + messageId + ")")
+        ) {
             while (rs.next()) {
                 result.add(getLabel(rs));
             }
@@ -209,16 +220,17 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
                 }
 
                 // remove existing labels
-                Statement stmt = connection.createStatement();
-                stmt.executeUpdate("DELETE FROM Message_Label WHERE message_id=" + message.getId());
-
-                // save labels
-                PreparedStatement ps = connection.prepareStatement("INSERT INTO Message_Label VALUES (" + message.getId() + ", ?)");
-                for (Label label : message.getLabels()) {
-                    ps.setLong(1, (Long) label.getId());
-                    ps.executeUpdate();
+                try (Statement stmt = connection.createStatement()) {
+                    stmt.executeUpdate("DELETE FROM Message_Label WHERE message_id=" + message.getId());
+                }
+                // save labels
+                try (PreparedStatement ps = connection.prepareStatement("INSERT INTO Message_Label VALUES (" +
+                        message.getId() + ", ?)")) {
+                    for (Label label : message.getLabels()) {
+                        ps.setLong(1, (Long) label.getId());
+                        ps.executeUpdate();
+                    }
                 }
-
                 connection.commit();
             } catch (IOException | SQLException e) {
                 try {
@@ -234,45 +246,48 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
     }
 
     private void insert(Connection connection, Plaintext message) throws SQLException, IOException {
-        PreparedStatement ps = connection.prepareStatement(
-                "INSERT INTO Message (iv, type, sender, recipient, data, sent, received, status, initial_hash) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
-                Statement.RETURN_GENERATED_KEYS);
-        ps.setBytes(1, message.getInventoryVector() == null ? null : message.getInventoryVector().getHash());
-        ps.setString(2, message.getType().name());
-        ps.setString(3, message.getFrom().getAddress());
-        ps.setString(4, message.getTo() == null ? null : message.getTo().getAddress());
-        writeBlob(ps, 5, message);
-        ps.setLong(6, message.getSent());
-        ps.setLong(7, message.getReceived());
-        ps.setString(8, message.getStatus() == null ? null : message.getStatus().name());
-        ps.setBytes(9, message.getInitialHash());
+        try (PreparedStatement ps = connection.prepareStatement(
+                "INSERT INTO Message (iv, type, sender, recipient, data, sent, received, status, initial_hash) " +
+                        "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
+                Statement.RETURN_GENERATED_KEYS)
+        ) {
+            ps.setBytes(1, message.getInventoryVector() == null ? null : message.getInventoryVector().getHash());
+            ps.setString(2, message.getType().name());
+            ps.setString(3, message.getFrom().getAddress());
+            ps.setString(4, message.getTo() == null ? null : message.getTo().getAddress());
+            writeBlob(ps, 5, message);
+            ps.setLong(6, message.getSent());
+            ps.setLong(7, message.getReceived());
+            ps.setString(8, message.getStatus() == null ? null : message.getStatus().name());
+            ps.setBytes(9, message.getInitialHash());
 
-        ps.executeUpdate();
-
-        // get generated id
-        ResultSet rs = ps.getGeneratedKeys();
-        rs.next();
-        message.setId(rs.getLong(1));
+            ps.executeUpdate();
+            // get generated id
+            try (ResultSet rs = ps.getGeneratedKeys()) {
+                rs.next();
+                message.setId(rs.getLong(1));
+            }
+        }
     }
 
     private void update(Connection connection, Plaintext message) throws SQLException, IOException {
-        PreparedStatement ps = connection.prepareStatement(
-                "UPDATE Message SET iv=?, sent=?, received=?, status=?, initial_hash=? WHERE id=?");
-        ps.setBytes(1, message.getInventoryVector() == null ? null : message.getInventoryVector().getHash());
-        ps.setLong(2, message.getSent());
-        ps.setLong(3, message.getReceived());
-        ps.setString(4, message.getStatus() == null ? null : message.getStatus().name());
-        ps.setBytes(5, message.getInitialHash());
-        ps.setLong(6, (Long) message.getId());
-        ps.executeUpdate();
+        try (PreparedStatement ps = connection.prepareStatement(
+                "UPDATE Message SET iv=?, sent=?, received=?, status=?, initial_hash=? WHERE id=?")) {
+            ps.setBytes(1, message.getInventoryVector() == null ? null : message.getInventoryVector().getHash());
+            ps.setLong(2, message.getSent());
+            ps.setLong(3, message.getReceived());
+            ps.setString(4, message.getStatus() == null ? null : message.getStatus().name());
+            ps.setBytes(5, message.getInitialHash());
+            ps.setLong(6, (Long) message.getId());
+            ps.executeUpdate();
+        }
     }
 
     @Override
     public void remove(Plaintext message) {
         try (Connection connection = config.getConnection()) {
-            try {
-                connection.setAutoCommit(false);
-                Statement stmt = connection.createStatement();
+            connection.setAutoCommit(false);
+            try (Statement stmt = connection.createStatement()) {
                 stmt.executeUpdate("DELETE FROM Message_Label WHERE message_id = " + message.getId());
                 stmt.executeUpdate("DELETE FROM Message WHERE id = " + message.getId());
                 connection.commit();
diff --git a/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java b/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java
index e88eaa4..a84e928 100644
--- a/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java
+++ b/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java
@@ -39,11 +39,7 @@ import static ch.dissem.bitmessage.utils.Singleton.security;
  * @author Christian Basler
  */
 public class WifImporter {
-    private final static Logger LOG = LoggerFactory.getLogger(WifImporter.class);
-
     private final BitmessageContext ctx;
-    private final Ini ini = new Ini();
-
     private final List<BitmessageAddress> identities = new LinkedList<>();
 
     public WifImporter(BitmessageContext ctx, File file) throws IOException {

From 9ca28ead66a54ba2f1f499d64244f87dfa9ddc4a Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 26 Feb 2016 16:12:43 +0100
Subject: [PATCH 21/87] Code cleanup

---
 .../bitmessage/repository/JdbcInventory.java  | 50 +++++++++------
 .../repository/JdbcMessageRepository.java     | 62 ++++++++++---------
 2 files changed, 62 insertions(+), 50 deletions(-)

diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java
index aa41e5c..e70cabb 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java
@@ -88,9 +88,11 @@ public class JdbcInventory extends JdbcHelper implements Inventory {
 
     @Override
     public ObjectMessage getObject(InventoryVector vector) {
-        try (Connection connection = config.getConnection()) {
-            Statement stmt = connection.createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT data, version FROM Inventory WHERE hash = X'" + vector + "'");
+        try (
+                Connection connection = config.getConnection();
+                Statement stmt = connection.createStatement();
+                ResultSet rs = stmt.executeQuery("SELECT data, version FROM Inventory WHERE hash = X'" + vector + "'")
+        ) {
             if (rs.next()) {
                 Blob data = rs.getBlob("data");
                 return Factory.getObjectMessage(rs.getInt("version"), data.getBinaryStream(), (int) data.length());
@@ -106,19 +108,21 @@ public class JdbcInventory extends JdbcHelper implements Inventory {
 
     @Override
     public List<ObjectMessage> getObjects(long stream, long version, ObjectType... types) {
-        try (Connection connection = config.getConnection()) {
-            StringBuilder query = new StringBuilder("SELECT data, version FROM Inventory WHERE 1=1");
-            if (stream > 0) {
-                query.append(" AND stream = ").append(stream);
-            }
-            if (version > 0) {
-                query.append(" AND version = ").append(version);
-            }
-            if (types.length > 0) {
-                query.append(" AND type IN (").append(join(types)).append(")");
-            }
-            Statement stmt = connection.createStatement();
-            ResultSet rs = stmt.executeQuery(query.toString());
+        StringBuilder query = new StringBuilder("SELECT data, version FROM Inventory WHERE 1=1");
+        if (stream > 0) {
+            query.append(" AND stream = ").append(stream);
+        }
+        if (version > 0) {
+            query.append(" AND version = ").append(version);
+        }
+        if (types.length > 0) {
+            query.append(" AND type IN (").append(join(types)).append(")");
+        }
+        try (
+                Connection connection = config.getConnection();
+                Statement stmt = connection.createStatement();
+                ResultSet rs = stmt.executeQuery(query.toString())
+        ) {
             List<ObjectMessage> result = new LinkedList<>();
             while (rs.next()) {
                 Blob data = rs.getBlob("data");
@@ -136,8 +140,11 @@ public class JdbcInventory extends JdbcHelper implements Inventory {
         if (getCache(object.getStream()).containsKey(object.getInventoryVector()))
             return;
 
-        try (Connection connection = config.getConnection()) {
-            PreparedStatement ps = connection.prepareStatement("INSERT INTO Inventory (hash, stream, expires, data, type, version) VALUES (?, ?, ?, ?, ?, ?)");
+        try (
+                Connection connection = config.getConnection();
+                PreparedStatement ps = connection.prepareStatement("INSERT INTO Inventory " +
+                        "(hash, stream, expires, data, type, version) VALUES (?, ?, ?, ?, ?, ?)")
+        ) {
             InventoryVector iv = object.getInventoryVector();
             LOG.trace("Storing object " + iv);
             ps.setBytes(1, iv.getHash());
@@ -163,8 +170,11 @@ public class JdbcInventory extends JdbcHelper implements Inventory {
 
     @Override
     public void cleanup() {
-        try (Connection connection = config.getConnection()) {
-            connection.createStatement().executeUpdate("DELETE FROM Inventory WHERE expires < " + now(-5 * MINUTE));
+        try (
+                Connection connection = config.getConnection();
+                Statement stmt = connection.createStatement()
+        ) {
+            stmt.executeUpdate("DELETE FROM Inventory WHERE expires < " + now(-5 * MINUTE));
         } catch (SQLException e) {
             LOG.debug(e.getMessage(), e);
         }
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
index 1d714d9..e043e7e 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
@@ -201,50 +201,52 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
         // save from address if necessary
         if (message.getId() == null) {
             BitmessageAddress savedAddress = ctx.getAddressRepository().getAddress(message.getFrom().getAddress());
-            if (savedAddress == null || savedAddress.getPrivateKey() == null) {
-                if (savedAddress != null && savedAddress.getAlias() != null) {
-                    message.getFrom().setAlias(savedAddress.getAlias());
-                }
+            if (savedAddress == null) {
                 ctx.getAddressRepository().save(message.getFrom());
+            } else if (savedAddress.getPubkey() == null && message.getFrom().getPubkey() != null) {
+                savedAddress.setPubkey(message.getFrom().getPubkey());
+                ctx.getAddressRepository().save(savedAddress);
             }
         }
 
         try (Connection connection = config.getConnection()) {
             try {
                 connection.setAutoCommit(false);
-                // save message
-                if (message.getId() == null) {
-                    insert(connection, message);
-                } else {
-                    update(connection, message);
-                }
-
-                // remove existing labels
-                try (Statement stmt = connection.createStatement()) {
-                    stmt.executeUpdate("DELETE FROM Message_Label WHERE message_id=" + message.getId());
-                }
-                // save labels
-                try (PreparedStatement ps = connection.prepareStatement("INSERT INTO Message_Label VALUES (" +
-                        message.getId() + ", ?)")) {
-                    for (Label label : message.getLabels()) {
-                        ps.setLong(1, (Long) label.getId());
-                        ps.executeUpdate();
-                    }
-                }
+                save(connection, message);
+                updateLabels(connection, message);
                 connection.commit();
             } catch (IOException | SQLException e) {
-                try {
-                    connection.rollback();
-                } catch (SQLException e1) {
-                    LOG.debug(e1.getMessage(), e);
-                }
-                throw new ApplicationException(e);
+                connection.rollback();
+                throw e;
             }
-        } catch (SQLException e) {
+        } catch (IOException | SQLException e) {
             throw new ApplicationException(e);
         }
     }
 
+    private void save(Connection connection, Plaintext message) throws IOException, SQLException {
+        if (message.getId() == null) {
+            insert(connection, message);
+        } else {
+            update(connection, message);
+        }
+    }
+
+    private void updateLabels(Connection connection, Plaintext message) throws SQLException {
+        // remove existing labels
+        try (Statement stmt = connection.createStatement()) {
+            stmt.executeUpdate("DELETE FROM Message_Label WHERE message_id=" + message.getId());
+        }
+        // save new labels
+        try (PreparedStatement ps = connection.prepareStatement("INSERT INTO Message_Label VALUES (" +
+                message.getId() + ", ?)")) {
+            for (Label label : message.getLabels()) {
+                ps.setLong(1, (Long) label.getId());
+                ps.executeUpdate();
+            }
+        }
+    }
+
     private void insert(Connection connection, Plaintext message) throws SQLException, IOException {
         try (PreparedStatement ps = connection.prepareStatement(
                 "INSERT INTO Message (iv, type, sender, recipient, data, sent, received, status, initial_hash) " +

From 57057298a1bf470701ff3953f9b701ac5e9d8756 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 26 Feb 2016 16:30:45 +0100
Subject: [PATCH 22/87] Code cleanup

---
 .../repository/JdbcAddressRepository.java     | 56 +++++++++++--------
 .../bitmessage/repository/JdbcInventory.java  | 13 +++--
 .../repository/JdbcProofOfWorkRepository.java | 49 +++++++++-------
 .../ch/dissem/bitmessage/wif/WifImporter.java | 15 +++--
 4 files changed, 80 insertions(+), 53 deletions(-)

diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java
index 97202d1..2cbd8c7 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java
@@ -21,7 +21,6 @@ import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.payload.V3Pubkey;
 import ch.dissem.bitmessage.entity.payload.V4Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
-import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.AddressRepository;
 import org.slf4j.Logger;
@@ -92,9 +91,12 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
 
     private List<BitmessageAddress> find(String where) {
         List<BitmessageAddress> result = new LinkedList<>();
-        try (Connection connection = config.getConnection()) {
-            Statement stmt = connection.createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT address, alias, public_key, private_key, subscribed FROM Address WHERE " + where);
+        try (
+                Connection connection = config.getConnection();
+                Statement stmt = connection.createStatement();
+                ResultSet rs = stmt.executeQuery("SELECT address, alias, public_key, private_key, subscribed " +
+                        "FROM Address WHERE " + where)
+        ) {
             while (rs.next()) {
                 BitmessageAddress address;
 
@@ -126,9 +128,12 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
     }
 
     private boolean exists(BitmessageAddress address) {
-        try (Connection connection = config.getConnection()) {
-            Statement stmt = connection.createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT COUNT(*) FROM Address WHERE address='" + address.getAddress() + "'");
+        try (
+                Connection connection = config.getConnection();
+                Statement stmt = connection.createStatement();
+                ResultSet rs = stmt.executeQuery("SELECT COUNT(*) FROM Address " +
+                        "WHERE address='" + address.getAddress() + "'")
+        ) {
             if (rs.next()) {
                 return rs.getInt(1) > 0;
             }
@@ -152,16 +157,18 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
     }
 
     private void update(BitmessageAddress address) throws IOException, SQLException {
-        try (Connection connection = config.getConnection()) {
-            StringBuilder statement = new StringBuilder("UPDATE Address SET alias=?");
-            if (address.getPubkey() != null) {
-                statement.append(", public_key=?");
-            }
-            if (address.getPrivateKey() != null) {
-                statement.append(", private_key=?");
-            }
-            statement.append(", subscribed=? WHERE address=?");
-            PreparedStatement ps = connection.prepareStatement(statement.toString());
+        StringBuilder statement = new StringBuilder("UPDATE Address SET alias=?");
+        if (address.getPubkey() != null) {
+            statement.append(", public_key=?");
+        }
+        if (address.getPrivateKey() != null) {
+            statement.append(", private_key=?");
+        }
+        statement.append(", subscribed=? WHERE address=?");
+        try (
+                Connection connection = config.getConnection();
+                PreparedStatement ps = connection.prepareStatement(statement.toString())
+        ) {
             int i = 0;
             ps.setString(++i, address.getAlias());
             if (address.getPubkey() != null) {
@@ -177,9 +184,12 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
     }
 
     private void insert(BitmessageAddress address) throws IOException, SQLException {
-        try (Connection connection = config.getConnection()) {
-            PreparedStatement ps = connection.prepareStatement(
-                    "INSERT INTO Address (address, version, alias, public_key, private_key, subscribed) VALUES (?, ?, ?, ?, ?, ?)");
+        try (
+                Connection connection = config.getConnection();
+                PreparedStatement ps = connection.prepareStatement(
+                        "INSERT INTO Address (address, version, alias, public_key, private_key, subscribed) " +
+                                "VALUES (?, ?, ?, ?, ?, ?)")
+        ) {
             ps.setString(1, address.getAddress());
             ps.setLong(2, address.getVersion());
             ps.setString(3, address.getAlias());
@@ -202,8 +212,10 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
 
     @Override
     public void remove(BitmessageAddress address) {
-        try (Connection connection = config.getConnection()) {
-            Statement stmt = connection.createStatement();
+        try (
+                Connection connection = config.getConnection();
+                Statement stmt = connection.createStatement()
+        ) {
             stmt.executeUpdate("DELETE FROM Address WHERE address = '" + address.getAddress() + "'");
         } catch (SQLException e) {
             LOG.error(e.getMessage(), e);
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java
index e70cabb..0cc9f3b 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java
@@ -61,11 +61,12 @@ public class JdbcInventory extends JdbcHelper implements Inventory {
                 if (cache.get(stream) == null) {
                     result = new ConcurrentHashMap<>();
                     cache.put(stream, result);
-
-                    try (Connection connection = config.getConnection()) {
-                        Statement stmt = connection.createStatement();
-                        ResultSet rs = stmt.executeQuery("SELECT hash, expires FROM Inventory WHERE expires > "
-                                + now(-5 * MINUTE) + " AND stream = " + stream);
+                    try (
+                            Connection connection = config.getConnection();
+                            Statement stmt = connection.createStatement();
+                            ResultSet rs = stmt.executeQuery("SELECT hash, expires FROM Inventory " +
+                                    "WHERE expires > " + now(-5 * MINUTE) + " AND stream = " + stream)
+                    ) {
                         while (rs.next()) {
                             result.put(new InventoryVector(rs.getBytes("hash")), rs.getLong("expires"));
                         }
@@ -116,7 +117,7 @@ public class JdbcInventory extends JdbcHelper implements Inventory {
             query.append(" AND version = ").append(version);
         }
         if (types.length > 0) {
-            query.append(" AND type IN (").append(join(types)).append(")");
+            query.append(" AND type IN (").append(join(types)).append(')');
         }
         try (
                 Connection connection = config.getConnection();
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java
index 37628b5..0fbb2dc 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java
@@ -27,19 +27,23 @@ public class JdbcProofOfWorkRepository extends JdbcHelper implements ProofOfWork
 
     @Override
     public Item getItem(byte[] initialHash) {
-        try (Connection connection = config.getConnection()) {
-            PreparedStatement ps = connection.prepareStatement("SELECT data, version, nonce_trials_per_byte, extra_bytes FROM POW WHERE initial_hash=?");
+        try (
+                Connection connection = config.getConnection();
+                PreparedStatement ps = connection.prepareStatement("SELECT data, version, nonce_trials_per_byte, " +
+                        "extra_bytes FROM POW WHERE initial_hash=?")
+        ) {
             ps.setBytes(1, initialHash);
-            ResultSet rs = ps.executeQuery();
-            if (rs.next()) {
-                Blob data = rs.getBlob("data");
-                return new Item(
-                        Factory.getObjectMessage(rs.getInt("version"), data.getBinaryStream(), (int) data.length()),
-                        rs.getLong("nonce_trials_per_byte"),
-                        rs.getLong("extra_bytes")
-                );
-            } else {
-                throw new IllegalArgumentException("Object requested that we don't have. Initial hash: " + Strings.hex(initialHash));
+            try (ResultSet rs = ps.executeQuery()) {
+                if (rs.next()) {
+                    Blob data = rs.getBlob("data");
+                    return new Item(
+                            Factory.getObjectMessage(rs.getInt("version"), data.getBinaryStream(), (int) data.length()),
+                            rs.getLong("nonce_trials_per_byte"),
+                            rs.getLong("extra_bytes")
+                    );
+                } else {
+                    throw new IllegalArgumentException("Object requested that we don't have. Initial hash: " + Strings.hex(initialHash));
+                }
             }
         } catch (SQLException e) {
             LOG.error(e.getMessage(), e);
@@ -49,10 +53,12 @@ public class JdbcProofOfWorkRepository extends JdbcHelper implements ProofOfWork
 
     @Override
     public List<byte[]> getItems() {
-        try (Connection connection = config.getConnection()) {
+        try (
+                Connection connection = config.getConnection();
+                Statement stmt = connection.createStatement();
+                ResultSet rs = stmt.executeQuery("SELECT initial_hash FROM POW")
+        ) {
             List<byte[]> result = new LinkedList<>();
-            Statement stmt = connection.createStatement();
-            ResultSet rs = stmt.executeQuery("SELECT initial_hash FROM POW");
             while (rs.next()) {
                 result.add(rs.getBytes("initial_hash"));
             }
@@ -65,8 +71,11 @@ public class JdbcProofOfWorkRepository extends JdbcHelper implements ProofOfWork
 
     @Override
     public void putObject(ObjectMessage object, long nonceTrialsPerByte, long extraBytes) {
-        try (Connection connection = config.getConnection()) {
-            PreparedStatement ps = connection.prepareStatement("INSERT INTO POW (initial_hash, data, version, nonce_trials_per_byte, extra_bytes) VALUES (?, ?, ?, ?, ?)");
+        try (
+                Connection connection = config.getConnection();
+                PreparedStatement ps = connection.prepareStatement("INSERT INTO POW (initial_hash, data, version, " +
+                        "nonce_trials_per_byte, extra_bytes) VALUES (?, ?, ?, ?, ?)")
+        ) {
             ps.setBytes(1, security().getInitialHash(object));
             writeBlob(ps, 2, object);
             ps.setLong(3, object.getVersion());
@@ -81,8 +90,10 @@ public class JdbcProofOfWorkRepository extends JdbcHelper implements ProofOfWork
 
     @Override
     public void removeObject(byte[] initialHash) {
-        try (Connection connection = config.getConnection()) {
-            PreparedStatement ps = connection.prepareStatement("DELETE FROM POW WHERE initial_hash=?");
+        try (
+                Connection connection = config.getConnection();
+                PreparedStatement ps = connection.prepareStatement("DELETE FROM POW WHERE initial_hash=?")
+        ) {
             ps.setBytes(1, initialHash);
             ps.executeUpdate();
         } catch (SQLException e) {
diff --git a/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java b/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java
index a84e928..3a45b44 100644
--- a/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java
+++ b/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java
@@ -23,8 +23,6 @@ import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.utils.Base58;
 import org.ini4j.Ini;
 import org.ini4j.Profile;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.*;
 import java.util.Arrays;
@@ -39,6 +37,9 @@ import static ch.dissem.bitmessage.utils.Singleton.security;
  * @author Christian Basler
  */
 public class WifImporter {
+    private static final byte WIF_FIRST_BYTE = (byte) 0x80;
+    private static final int WIF_SECRET_LENGTH = 37;
+
     private final BitmessageContext ctx;
     private final List<BitmessageAddress> identities = new LinkedList<>();
 
@@ -76,10 +77,12 @@ public class WifImporter {
 
     private byte[] getSecret(String walletImportFormat) throws IOException {
         byte[] bytes = Base58.decode(walletImportFormat);
-        if (bytes[0] != (byte) 0x80)
-            throw new IOException("Unknown format: 0x80 expected as first byte, but secret " + walletImportFormat + " was " + bytes[0]);
-        if (bytes.length != 37)
-            throw new IOException("Unknown format: 37 bytes expected, but secret " + walletImportFormat + " was " + bytes.length + " long");
+        if (bytes[0] != WIF_FIRST_BYTE)
+            throw new IOException("Unknown format: 0x80 expected as first byte, but secret " + walletImportFormat +
+                    " was " + bytes[0]);
+        if (bytes.length != WIF_SECRET_LENGTH)
+            throw new IOException("Unknown format: " + WIF_SECRET_LENGTH +
+                    " bytes expected, but secret " + walletImportFormat + " was " + bytes.length + " long");
 
         byte[] hash = security().doubleSha256(bytes, 33);
         for (int i = 0; i < 4; i++) {

From 3e5e431d6f39fb8a7269b45c6a3bb0070cfbf13c Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Sun, 28 Feb 2016 23:03:00 +0100
Subject: [PATCH 23/87] Code cleanup

---
 .../cryptography/bc/BouncyCryptography.java   |  19 +-
 .../cryptography/sc/SpongyCryptography.java   |  19 +-
 .../dissem/bitmessage/demo/Application.java   | 186 ++++----------
 .../dissem/bitmessage/demo/CommandLine.java   | 102 ++++++++
 .../java/ch/dissem/bitmessage/demo/Main.java  |   6 +-
 .../bitmessage/networking/Connection.java     | 242 ++++++++++--------
 6 files changed, 313 insertions(+), 261 deletions(-)
 create mode 100644 demo/src/main/java/ch/dissem/bitmessage/demo/CommandLine.java

diff --git a/cryptography-bc/src/main/java/ch/dissem/bitmessage/cryptography/bc/BouncyCryptography.java b/cryptography-bc/src/main/java/ch/dissem/bitmessage/cryptography/bc/BouncyCryptography.java
index 41e2c37..377135c 100644
--- a/cryptography-bc/src/main/java/ch/dissem/bitmessage/cryptography/bc/BouncyCryptography.java
+++ b/cryptography-bc/src/main/java/ch/dissem/bitmessage/cryptography/bc/BouncyCryptography.java
@@ -51,19 +51,23 @@ import java.util.Arrays;
  */
 public class BouncyCryptography extends AbstractCryptography {
     private static final X9ECParameters EC_CURVE_PARAMETERS = CustomNamedCurves.getByName("secp256k1");
+    private static final String ALGORITHM_ECDSA = "ECDSA";
+    private static final String PROVIDER = "BC";
 
     static {
         java.security.Security.addProvider(new BouncyCastleProvider());
     }
 
     public BouncyCryptography() {
-        super("BC");
+        super(PROVIDER);
     }
 
     @Override
     public byte[] crypt(boolean encrypt, byte[] data, byte[] key_e, byte[] initializationVector) {
-        BufferedBlockCipher cipher = new PaddedBufferedBlockCipher(new CBCBlockCipher(new AESEngine()), new PKCS7Padding());
-
+        BufferedBlockCipher cipher = new PaddedBufferedBlockCipher(
+                new CBCBlockCipher(new AESEngine()),
+                new PKCS7Padding()
+        );
         CipherParameters params = new ParametersWithIV(new KeyParameter(key_e), initializationVector);
 
         cipher.init(encrypt, params);
@@ -105,9 +109,9 @@ public class BouncyCryptography extends AbstractCryptography {
 
             ECPoint Q = keyToPoint(pubkey.getSigningKey());
             KeySpec keySpec = new ECPublicKeySpec(Q, spec);
-            PublicKey publicKey = KeyFactory.getInstance("ECDSA", "BC").generatePublic(keySpec);
+            PublicKey publicKey = KeyFactory.getInstance(ALGORITHM_ECDSA, PROVIDER).generatePublic(keySpec);
 
-            Signature sig = Signature.getInstance("ECDSA", "BC");
+            Signature sig = Signature.getInstance(ALGORITHM_ECDSA, PROVIDER);
             sig.initVerify(publicKey);
             sig.update(data);
             return sig.verify(signature);
@@ -129,9 +133,10 @@ public class BouncyCryptography extends AbstractCryptography {
 
             BigInteger d = keyToBigInt(privateKey.getPrivateSigningKey());
             KeySpec keySpec = new ECPrivateKeySpec(d, spec);
-            java.security.PrivateKey privKey = KeyFactory.getInstance("ECDSA", "BC").generatePrivate(keySpec);
+            java.security.PrivateKey privKey = KeyFactory.getInstance(ALGORITHM_ECDSA, PROVIDER)
+                    .generatePrivate(keySpec);
 
-            Signature sig = Signature.getInstance("ECDSA", "BC");
+            Signature sig = Signature.getInstance(ALGORITHM_ECDSA, PROVIDER);
             sig.initSign(privKey);
             sig.update(data);
             return sig.sign();
diff --git a/cryptography-sc/src/main/java/ch/dissem/bitmessage/cryptography/sc/SpongyCryptography.java b/cryptography-sc/src/main/java/ch/dissem/bitmessage/cryptography/sc/SpongyCryptography.java
index 066ca10..b90e1c8 100644
--- a/cryptography-sc/src/main/java/ch/dissem/bitmessage/cryptography/sc/SpongyCryptography.java
+++ b/cryptography-sc/src/main/java/ch/dissem/bitmessage/cryptography/sc/SpongyCryptography.java
@@ -51,19 +51,23 @@ import java.util.Arrays;
  */
 public class SpongyCryptography extends AbstractCryptography {
     private static final X9ECParameters EC_CURVE_PARAMETERS = CustomNamedCurves.getByName("secp256k1");
+    private static final String ALGORITHM_ECDSA = "ECDSA";
+    private static final String PROVIDER = "SC";
 
     static {
         java.security.Security.addProvider(new BouncyCastleProvider());
     }
 
     public SpongyCryptography() {
-        super("SC");
+        super(PROVIDER);
     }
 
     @Override
     public byte[] crypt(boolean encrypt, byte[] data, byte[] key_e, byte[] initializationVector) {
-        BufferedBlockCipher cipher = new PaddedBufferedBlockCipher(new CBCBlockCipher(new AESEngine()), new PKCS7Padding());
-
+        BufferedBlockCipher cipher = new PaddedBufferedBlockCipher(
+                new CBCBlockCipher(new AESEngine()),
+                new PKCS7Padding()
+        );
         CipherParameters params = new ParametersWithIV(new KeyParameter(key_e), initializationVector);
 
         cipher.init(encrypt, params);
@@ -105,9 +109,9 @@ public class SpongyCryptography extends AbstractCryptography {
 
             ECPoint Q = keyToPoint(pubkey.getSigningKey());
             KeySpec keySpec = new ECPublicKeySpec(Q, spec);
-            PublicKey publicKey = KeyFactory.getInstance("ECDSA", "SC").generatePublic(keySpec);
+            PublicKey publicKey = KeyFactory.getInstance(ALGORITHM_ECDSA, PROVIDER).generatePublic(keySpec);
 
-            Signature sig = Signature.getInstance("ECDSA", "SC");
+            Signature sig = Signature.getInstance(ALGORITHM_ECDSA, PROVIDER);
             sig.initVerify(publicKey);
             sig.update(data);
             return sig.verify(signature);
@@ -129,9 +133,10 @@ public class SpongyCryptography extends AbstractCryptography {
 
             BigInteger d = keyToBigInt(privateKey.getPrivateSigningKey());
             KeySpec keySpec = new ECPrivateKeySpec(d, spec);
-            java.security.PrivateKey privKey = KeyFactory.getInstance("ECDSA", "SC").generatePrivate(keySpec);
+            java.security.PrivateKey privKey = KeyFactory.getInstance(ALGORITHM_ECDSA, PROVIDER)
+                    .generatePrivate(keySpec);
 
-            Signature sig = Signature.getInstance("ECDSA", "SC");
+            Signature sig = Signature.getInstance(ALGORITHM_ECDSA, PROVIDER);
             sig.initSign(privKey);
             sig.update(data);
             return sig.sign();
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
index dab43f3..a6a6e1f 100644
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
@@ -17,31 +17,33 @@
 package ch.dissem.bitmessage.demo;
 
 import ch.dissem.bitmessage.BitmessageContext;
+import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.networking.DefaultNetworkHandler;
 import ch.dissem.bitmessage.ports.MemoryNodeRegistry;
 import ch.dissem.bitmessage.repository.*;
-import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.util.List;
-import java.util.Scanner;
+
+import static ch.dissem.bitmessage.demo.CommandLine.COMMAND_BACK;
+import static ch.dissem.bitmessage.demo.CommandLine.ERROR_UNKNOWN_COMMAND;
 
 /**
  * A simple command line Bitmessage application
  */
 public class Application {
     private final static Logger LOG = LoggerFactory.getLogger(Application.class);
-    private final Scanner scanner;
+    private final CommandLine commandLine;
 
     private BitmessageContext ctx;
 
-    public Application(String syncServer, int syncPort) {
+    public Application(InetAddress syncServer, int syncPort) {
         JdbcConfig jdbcConfig = new JdbcConfig();
         ctx = new BitmessageContext.Builder()
                 .addressRepo(new JdbcAddressRepository(jdbcConfig))
@@ -68,7 +70,7 @@ public class Application {
             ctx.startup();
         }
 
-        scanner = new Scanner(System.in);
+        commandLine = new CommandLine();
 
         String command;
         do {
@@ -84,7 +86,7 @@ public class Application {
             System.out.println("?) info");
             System.out.println("e) exit");
 
-            command = nextCommand();
+            command = commandLine.nextCommand();
             try {
                 switch (command) {
                     case "i": {
@@ -106,10 +108,12 @@ public class Application {
                     case "e":
                         break;
                     case "y":
-                        ctx.synchronize(InetAddress.getByName(syncServer), syncPort, 120, true);
+                        if (syncServer != null) {
+                            ctx.synchronize(syncServer, syncPort, 120, true);
+                        }
                         break;
                     default:
-                        System.out.println("Unknown command. Please try again.");
+                        System.out.println(ERROR_UNKNOWN_COMMAND);
                 }
             } catch (Exception e) {
                 LOG.debug(e.getMessage());
@@ -125,32 +129,16 @@ public class Application {
         System.out.println(ctx.status());
     }
 
-    private String nextCommand() {
-        return scanner.nextLine().trim().toLowerCase();
-    }
-
     private void identities() {
         String command;
         List<BitmessageAddress> identities = ctx.addresses().getIdentities();
         do {
             System.out.println();
-            int i = 0;
-            for (BitmessageAddress identity : identities) {
-                i++;
-                System.out.print(i + ") ");
-                if (identity.getAlias() != null) {
-                    System.out.println(identity.getAlias() + " (" + identity.getAddress() + ")");
-                } else {
-                    System.out.println(identity.getAddress());
-                }
-            }
-            if (i == 0) {
-                System.out.println("You have no identities yet.");
-            }
+            commandLine.listAddresses(identities, "identities");
             System.out.println("a) create identity");
-            System.out.println("b) back");
+            System.out.println(COMMAND_BACK);
 
-            command = nextCommand();
+            command = commandLine.nextCommand();
             switch (command) {
                 case "a":
                     addIdentity();
@@ -163,7 +151,7 @@ public class Application {
                         int index = Integer.parseInt(command) - 1;
                         address(identities.get(index));
                     } catch (NumberFormatException e) {
-                        System.out.println("Unknown command. Please try again.");
+                        System.out.println(ERROR_UNKNOWN_COMMAND);
                     }
             }
         } while (!"b".equals(command));
@@ -171,9 +159,9 @@ public class Application {
 
     private void addIdentity() {
         System.out.println();
-        BitmessageAddress identity = ctx.createIdentity(yesNo("would you like a shorter address? This will take some time to calculate."), Pubkey.Feature.DOES_ACK);
+        BitmessageAddress identity = ctx.createIdentity(commandLine.yesNo("would you like a shorter address? This will take some time to calculate."), Pubkey.Feature.DOES_ACK);
         System.out.println("Please enter an alias for this identity, or an empty string for none");
-        String alias = scanner.nextLine().trim();
+        String alias = commandLine.nextLineTrimmed();
         if (alias.length() > 0) {
             identity.setAlias(alias);
         }
@@ -185,24 +173,12 @@ public class Application {
         List<BitmessageAddress> contacts = ctx.addresses().getContacts();
         do {
             System.out.println();
-            int i = 0;
-            for (BitmessageAddress contact : contacts) {
-                i++;
-                System.out.print(i + ") ");
-                if (contact.getAlias() != null) {
-                    System.out.println(contact.getAlias() + " (" + contact.getAddress() + ")");
-                } else {
-                    System.out.println(contact.getAddress());
-                }
-            }
-            if (i == 0) {
-                System.out.println("You have no contacts yet.");
-            }
+            commandLine.listAddresses(contacts, "contacts");
             System.out.println();
             System.out.println("a) add contact");
-            System.out.println("b) back");
+            System.out.println(COMMAND_BACK);
 
-            command = nextCommand();
+            command = commandLine.nextCommand();
             switch (command) {
                 case "a":
                     addContact(false);
@@ -215,7 +191,7 @@ public class Application {
                         int index = Integer.parseInt(command) - 1;
                         address(contacts.get(index));
                     } catch (NumberFormatException e) {
-                        System.out.println("Unknown command. Please try again.");
+                        System.out.println(ERROR_UNKNOWN_COMMAND);
                     }
             }
         } while (!"b".equals(command));
@@ -225,9 +201,9 @@ public class Application {
         System.out.println();
         System.out.println("Please enter the Bitmessage address you want to add");
         try {
-            BitmessageAddress address = new BitmessageAddress(scanner.nextLine().trim());
+            BitmessageAddress address = new BitmessageAddress(commandLine.nextLineTrimmed());
             System.out.println("Please enter an alias for this address, or an empty string for none");
-            String alias = scanner.nextLine().trim();
+            String alias = commandLine.nextLineTrimmed();
             if (alias.length() > 0) {
                 address.setAlias(alias);
             }
@@ -245,24 +221,12 @@ public class Application {
         List<BitmessageAddress> subscriptions = ctx.addresses().getSubscriptions();
         do {
             System.out.println();
-            int i = 0;
-            for (BitmessageAddress contact : subscriptions) {
-                i++;
-                System.out.print(i + ") ");
-                if (contact.getAlias() != null) {
-                    System.out.println(contact.getAlias() + " (" + contact.getAddress() + ")");
-                } else {
-                    System.out.println(contact.getAddress());
-                }
-            }
-            if (i == 0) {
-                System.out.println("You have no subscriptions yet.");
-            }
+            commandLine.listAddresses(subscriptions, "subscriptions");
             System.out.println();
             System.out.println("a) add subscription");
-            System.out.println("b) back");
+            System.out.println(COMMAND_BACK);
 
-            command = nextCommand();
+            command = commandLine.nextCommand();
             switch (command) {
                 case "a":
                     addContact(true);
@@ -275,7 +239,7 @@ public class Application {
                         int index = Integer.parseInt(command) - 1;
                         address(subscriptions.get(index));
                     } catch (NumberFormatException e) {
-                        System.out.println("Unknown command. Please try again.");
+                        System.out.println(ERROR_UNKNOWN_COMMAND);
                     }
             }
         } while (!"b".equals(command));
@@ -313,9 +277,9 @@ public class Application {
             System.out.println();
             System.out.println("c) compose message");
             System.out.println("s) compose broadcast");
-            System.out.println("b) back");
+            System.out.println(COMMAND_BACK);
 
-            command = scanner.nextLine().trim();
+            command = commandLine.nextCommand();
             switch (command) {
                 case "c":
                     compose(false);
@@ -330,7 +294,7 @@ public class Application {
                         int index = Integer.parseInt(command) - 1;
                         show(messages.get(index));
                     } catch (NumberFormatException | IndexOutOfBoundsException e) {
-                        System.out.println("Unknown command. Please try again.");
+                        System.out.println(ERROR_UNKNOWN_COMMAND);
                     }
             }
         } while (!"b".equalsIgnoreCase(command));
@@ -350,8 +314,8 @@ public class Application {
         do {
             System.out.println("r) reply");
             System.out.println("d) delete");
-            System.out.println("b) back");
-            command = nextCommand();
+            System.out.println(COMMAND_BACK);
+            command = commandLine.nextCommand();
             switch (command) {
                 case "r":
                     compose(message.getTo(), message.getFrom(), "RE: " + message.getSubject());
@@ -361,18 +325,18 @@ public class Application {
                 case "b":
                     return;
                 default:
-                    System.out.println("Unknown command. Please try again.");
+                    System.out.println(ERROR_UNKNOWN_COMMAND);
             }
         } while (!"b".equalsIgnoreCase(command));
     }
 
     private void compose(boolean broadcast) {
         System.out.println();
-        BitmessageAddress from = selectAddress(true);
+        BitmessageAddress from = selectIdentity();
         if (from == null) {
             return;
         }
-        BitmessageAddress to = (broadcast ? null : selectAddress(false));
+        BitmessageAddress to = (broadcast ? null : selectContact());
         if (!broadcast && to == null) {
             return;
         }
@@ -380,58 +344,22 @@ public class Application {
         compose(from, to, null);
     }
 
-    private BitmessageAddress selectAddress(boolean id) {
-        List<BitmessageAddress> addresses = (id ? ctx.addresses().getIdentities() : ctx.addresses().getContacts());
+    private BitmessageAddress selectIdentity() {
+        List<BitmessageAddress> addresses = ctx.addresses().getIdentities();
         while (addresses.size() == 0) {
-            if (id) {
-                addIdentity();
-                addresses = ctx.addresses().getIdentities();
-            } else {
-                addContact(false);
-                addresses = ctx.addresses().getContacts();
-            }
+            addIdentity();
+            addresses = ctx.addresses().getIdentities();
         }
-        if (addresses.size() == 1) {
-            return addresses.get(0);
+        return commandLine.selectAddress(addresses, "From:");
+    }
+
+    private BitmessageAddress selectContact() {
+        List<BitmessageAddress> addresses = ctx.addresses().getContacts();
+        while (addresses.size() == 0) {
+            addContact(false);
+            addresses = ctx.addresses().getContacts();
         }
-
-        String command;
-        do {
-            System.out.println();
-            if (id) {
-                System.out.println("From:");
-            } else {
-                System.out.println("To:");
-            }
-
-            int i = 0;
-            for (BitmessageAddress identity : addresses) {
-                i++;
-                System.out.print(i + ") ");
-                if (identity.getAlias() != null) {
-                    System.out.println(identity.getAlias() + " (" + identity.getAddress() + ")");
-                } else {
-                    System.out.println(identity.getAddress());
-                }
-            }
-            System.out.println("b) back");
-
-            command = nextCommand();
-            switch (command) {
-                case "b":
-                    return null;
-                default:
-                    try {
-                        int index = Integer.parseInt(command) - 1;
-                        if (addresses.get(index) != null) {
-                            return addresses.get(index);
-                        }
-                    } catch (NumberFormatException e) {
-                        System.out.println("Unknown command. Please try again.");
-                    }
-            }
-        } while (!"b".equals(command));
-        return null;
+        return commandLine.selectAddress(addresses, "To:");
     }
 
     private void compose(BitmessageAddress from, BitmessageAddress to, String subject) {
@@ -445,29 +373,19 @@ public class Application {
             System.out.println("Subject: " + subject);
         } else {
             System.out.print("Subject: ");
-            subject = scanner.nextLine().trim();
+            subject = commandLine.nextLineTrimmed();
         }
         System.out.println("Message:");
         StringBuilder message = new StringBuilder();
         String line;
         do {
-            line = scanner.nextLine();
+            line = commandLine.nextLine();
             message.append(line).append('\n');
-        } while (line.length() > 0 || !yesNo("Send message?"));
+        } while (line.length() > 0 || !commandLine.yesNo("Send message?"));
         if (broadcast) {
             ctx.broadcast(from, subject, message.toString());
         } else {
             ctx.send(from, to, subject, message.toString());
         }
     }
-
-    private boolean yesNo(String question) {
-        String answer;
-        do {
-            System.out.println(question + " (y/n)");
-            answer = scanner.nextLine();
-            if ("y".equalsIgnoreCase(answer)) return true;
-            if ("n".equalsIgnoreCase(answer)) return false;
-        } while (true);
-    }
 }
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/CommandLine.java b/demo/src/main/java/ch/dissem/bitmessage/demo/CommandLine.java
new file mode 100644
index 0000000..f04196a
--- /dev/null
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/CommandLine.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.demo;
+
+import ch.dissem.bitmessage.entity.BitmessageAddress;
+
+import java.util.List;
+import java.util.Scanner;
+
+
+/**
+ * @author Christian Basler
+ */
+public class CommandLine {
+    public static final String COMMAND_BACK = "b) back";
+    public static final String ERROR_UNKNOWN_COMMAND = "Unknown command. Please try again.";
+
+    private Scanner scanner = new Scanner(System.in);
+
+    public String nextCommand() {
+        return scanner.nextLine().trim().toLowerCase();
+    }
+
+    public String nextLine() {
+        return scanner.nextLine();
+    }
+
+    public String nextLineTrimmed() {
+        return scanner.nextLine();
+    }
+
+    public boolean yesNo(String question) {
+        String answer;
+        do {
+            System.out.println(question + " (y/n)");
+            answer = scanner.nextLine();
+            if ("y".equalsIgnoreCase(answer)) return true;
+            if ("n".equalsIgnoreCase(answer)) return false;
+        } while (true);
+    }
+
+    public BitmessageAddress selectAddress(List<BitmessageAddress> addresses, String label) {
+        if (addresses.size() == 1) {
+            return addresses.get(0);
+        }
+
+        String command;
+        do {
+            System.out.println();
+            System.out.println(label);
+
+            listAddresses(addresses, "contacts");
+            System.out.println(COMMAND_BACK);
+
+            command = nextCommand();
+            switch (command) {
+                case "b":
+                    return null;
+                default:
+                    try {
+                        int index = Integer.parseInt(command) - 1;
+                        if (addresses.get(index) != null) {
+                            return addresses.get(index);
+                        }
+                    } catch (NumberFormatException e) {
+                        System.out.println(ERROR_UNKNOWN_COMMAND);
+                    }
+            }
+        } while (!"b".equals(command));
+        return null;
+    }
+
+    public void listAddresses(List<BitmessageAddress> addresses, String kind) {
+        int i = 0;
+        for (BitmessageAddress address : addresses) {
+            i++;
+            System.out.print(i + ") ");
+            if (address.getAlias() == null) {
+                System.out.println(address.getAddress());
+            } else {
+                System.out.println(address.getAlias() + " (" + address.getAddress() + ")");
+            }
+        }
+        if (i == 0) {
+            System.out.println("You have no " + kind + " yet.");
+        }
+    }
+}
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
index b0e114b..2532796 100644
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
@@ -17,10 +17,10 @@
 package ch.dissem.bitmessage.demo;
 
 import ch.dissem.bitmessage.BitmessageContext;
+import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.networking.DefaultNetworkHandler;
 import ch.dissem.bitmessage.ports.MemoryNodeRegistry;
 import ch.dissem.bitmessage.repository.*;
-import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.wif.WifExporter;
 import ch.dissem.bitmessage.wif.WifImporter;
 import org.kohsuke.args4j.CmdLineException;
@@ -29,6 +29,7 @@ import org.kohsuke.args4j.Option;
 
 import java.io.File;
 import java.io.IOException;
+import java.net.InetAddress;
 
 public class Main {
     public static void main(String[] args) throws IOException {
@@ -64,7 +65,8 @@ public class Main {
                 new WifImporter(ctx, options.importWIF).importAll();
             }
         } else {
-            new Application(options.syncServer, options.syncPort);
+            InetAddress syncServer = options.syncServer == null ? null : InetAddress.getByName(options.syncServer);
+            new Application(syncServer, options.syncPort);
         }
     }
 
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
index 43f1e30..5781bc3 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
@@ -203,51 +203,16 @@ class Connection {
     private void receiveMessage(MessagePayload messagePayload) {
         switch (messagePayload.getCommand()) {
             case INV:
-                Inv inv = (Inv) messagePayload;
-                int originalSize = inv.getInventory().size();
-                updateIvCache(inv.getInventory());
-                List<InventoryVector> missing = ctx.getInventory().getMissing(inv.getInventory(), streams);
-                missing.removeAll(commonRequestedObjects);
-                LOG.debug("Received inventory with " + originalSize + " elements, of which are "
-                        + missing.size() + " missing.");
-                send(new GetData.Builder().inventory(missing).build());
+                receiveMessage((Inv) messagePayload);
                 break;
             case GETDATA:
-                GetData getData = (GetData) messagePayload;
-                for (InventoryVector iv : getData.getInventory()) {
-                    ObjectMessage om = ctx.getInventory().getObject(iv);
-                    if (om != null) sendingQueue.offer(om);
-                }
+                receiveMessage((GetData) messagePayload);
                 break;
             case OBJECT:
-                ObjectMessage objectMessage = (ObjectMessage) messagePayload;
-                try {
-                    requestedObjects.remove(objectMessage.getInventoryVector());
-                    if (ctx.getInventory().contains(objectMessage)) {
-                        LOG.trace("Received object " + objectMessage.getInventoryVector() + " - already in inventory");
-                        break;
-                    }
-                    listener.receive(objectMessage);
-                    security().checkProofOfWork(objectMessage, ctx.getNetworkNonceTrialsPerByte(), ctx.getNetworkExtraBytes());
-                    ctx.getInventory().storeObject(objectMessage);
-                    // offer object to some random nodes so it gets distributed throughout the network:
-                    networkHandler.offer(objectMessage.getInventoryVector());
-                    lastObjectTime = UnixTime.now();
-                } catch (InsufficientProofOfWorkException e) {
-                    LOG.warn(e.getMessage());
-                    // DebugUtils.saveToFile(objectMessage); // this line must not be committed active
-                } catch (IOException e) {
-                    LOG.error("Stream " + objectMessage.getStream() + ", object type " + objectMessage.getType() + ": " + e.getMessage(), e);
-                } finally {
-                    if (commonRequestedObjects.remove(objectMessage.getInventoryVector())) {
-                        LOG.debug("Received object that wasn't requested.");
-                    }
-                }
+                receiveMessage((ObjectMessage) messagePayload);
                 break;
             case ADDR:
-                Addr addr = (Addr) messagePayload;
-                LOG.debug("Received " + addr.getAddresses().size() + " addresses.");
-                ctx.getNodeRegistry().offerAddresses(addr.getAddresses());
+                receiveMessage((Addr) messagePayload);
                 break;
             case CUSTOM:
             case VERACK:
@@ -257,6 +222,53 @@ class Connection {
         }
     }
 
+    private void receiveMessage(Inv inv) {
+        int originalSize = inv.getInventory().size();
+        updateIvCache(inv.getInventory());
+        List<InventoryVector> missing = ctx.getInventory().getMissing(inv.getInventory(), streams);
+        missing.removeAll(commonRequestedObjects);
+        LOG.debug("Received inventory with " + originalSize + " elements, of which are "
+                + missing.size() + " missing.");
+        send(new GetData.Builder().inventory(missing).build());
+    }
+
+    private void receiveMessage(GetData getData) {
+        for (InventoryVector iv : getData.getInventory()) {
+            ObjectMessage om = ctx.getInventory().getObject(iv);
+            if (om != null) sendingQueue.offer(om);
+        }
+    }
+
+    private void receiveMessage(ObjectMessage objectMessage) {
+        requestedObjects.remove(objectMessage.getInventoryVector());
+        if (ctx.getInventory().contains(objectMessage)) {
+            LOG.trace("Received object " + objectMessage.getInventoryVector() + " - already in inventory");
+            return;
+        }
+        try {
+            listener.receive(objectMessage);
+            security().checkProofOfWork(objectMessage, ctx.getNetworkNonceTrialsPerByte(), ctx.getNetworkExtraBytes());
+            ctx.getInventory().storeObject(objectMessage);
+            // offer object to some random nodes so it gets distributed throughout the network:
+            networkHandler.offer(objectMessage.getInventoryVector());
+            lastObjectTime = UnixTime.now();
+        } catch (InsufficientProofOfWorkException e) {
+            LOG.warn(e.getMessage());
+            // DebugUtils.saveToFile(objectMessage); // this line must not be committed active
+        } catch (IOException e) {
+            LOG.error("Stream " + objectMessage.getStream() + ", object type " + objectMessage.getType() + ": " + e.getMessage(), e);
+        } finally {
+            if (commonRequestedObjects.remove(objectMessage.getInventoryVector())) {
+                LOG.debug("Received object that wasn't requested.");
+            }
+        }
+    }
+
+    private void receiveMessage(Addr addr) {
+        LOG.debug("Received " + addr.getAddresses().size() + " addresses.");
+        ctx.getNodeRegistry().offerAddresses(addr.getAddresses());
+    }
+
     private void sendAddresses() {
         List<NetworkAddress> addresses = ctx.getNodeRegistry().getKnownAddresses(1000, streams);
         sendingQueue.offer(new Addr.Builder().addresses(addresses).build());
@@ -358,77 +370,10 @@ class Connection {
                             Thread.sleep(100);
                         }
                     }
-                    try {
-                        NetworkMessage msg = Factory.getNetworkMessage(version, in);
-                        if (msg == null)
-                            continue;
-                        switch (state) {
-                            case ACTIVE:
-                                receiveMessage(msg.getPayload());
-                                break;
-
-                            default:
-                                switch (msg.getPayload().getCommand()) {
-                                    case VERSION:
-                                        Version payload = (Version) msg.getPayload();
-                                        if (payload.getNonce() == ctx.getClientNonce()) {
-                                            LOG.info("Tried to connect to self, disconnecting.");
-                                            disconnect();
-                                        } else if (payload.getVersion() >= BitmessageContext.CURRENT_VERSION) {
-                                            version = payload.getVersion();
-                                            streams = payload.getStreams();
-                                            send(new VerAck());
-                                            switch (mode) {
-                                                case SERVER:
-                                                    send(new Version.Builder().defaults().addrFrom(host).addrRecv(node).build());
-                                                    break;
-                                                case CLIENT:
-                                                case SYNC:
-                                                    activateConnection();
-                                                    break;
-                                                default:
-                                                    // NO OP
-                                            }
-                                        } else {
-                                            LOG.info("Received unsupported version " + payload.getVersion() + ", disconnecting.");
-                                            disconnect();
-                                        }
-                                        break;
-                                    case VERACK:
-                                        switch (mode) {
-                                            case SERVER:
-                                                activateConnection();
-                                                break;
-                                            case CLIENT:
-                                            case SYNC:
-                                            default:
-                                                // NO OP
-                                                break;
-                                        }
-                                        break;
-                                    case CUSTOM:
-                                        MessagePayload response = ctx.getCustomCommandHandler().handle((CustomMessage) msg.getPayload());
-                                        if (response != null) {
-                                            send(response);
-                                        }
-                                        disconnect();
-                                        break;
-                                    default:
-                                        throw new NodeException("Command 'version' or 'verack' expected, but was '"
-                                                + msg.getPayload().getCommand() + "'");
-                                }
-                        }
-                        if (socket.isClosed() || syncFinished(msg) || checkOpenRequests()) disconnect();
-                    } catch (SocketTimeoutException ignore) {
-                        if (state == ACTIVE) {
-                            if (syncFinished(null)) disconnect();
-                        }
-                    }
+                    receive();
                 }
-            } catch (InterruptedException | IOException | NodeException e) {
+            } catch (Exception e) {
                 LOG.trace("Reader disconnected from node " + node + ": " + e.getMessage());
-            } catch (RuntimeException e) {
-                LOG.trace("Reader disconnecting from node " + node + " due to error: " + e.getMessage(), e);
             } finally {
                 disconnect();
                 try {
@@ -438,6 +383,81 @@ class Connection {
                 }
             }
         }
+
+        private void receive() throws InterruptedException {
+            try {
+                NetworkMessage msg = Factory.getNetworkMessage(version, in);
+                if (msg == null)
+                    return;
+                switch (state) {
+                    case ACTIVE:
+                        receiveMessage(msg.getPayload());
+                        break;
+
+                    default:
+                        handleCommand(msg.getPayload());
+                        break;
+                }
+                if (socket.isClosed() || syncFinished(msg) || checkOpenRequests()) disconnect();
+            } catch (SocketTimeoutException ignore) {
+                if (state == ACTIVE && syncFinished(null)) disconnect();
+            }
+        }
+
+        private void handleCommand(MessagePayload payload) {
+            switch (payload.getCommand()) {
+                case VERSION:
+                    handleVersion((Version) payload);
+                    break;
+                case VERACK:
+                    switch (mode) {
+                        case SERVER:
+                            activateConnection();
+                            break;
+                        case CLIENT:
+                        case SYNC:
+                        default:
+                            // NO OP
+                            break;
+                    }
+                    break;
+                case CUSTOM:
+                    MessagePayload response = ctx.getCustomCommandHandler().handle((CustomMessage) payload);
+                    if (response != null) {
+                        send(response);
+                    }
+                    disconnect();
+                    break;
+                default:
+                    throw new NodeException("Command 'version' or 'verack' expected, but was '"
+                            + payload.getCommand() + "'");
+            }
+        }
+
+        private void handleVersion(Version version) {
+            if (version.getNonce() == ctx.getClientNonce()) {
+                LOG.info("Tried to connect to self, disconnecting.");
+                disconnect();
+            } else if (version.getVersion() >= BitmessageContext.CURRENT_VERSION) {
+                Connection.this.version = version.getVersion();
+                streams = version.getStreams();
+                send(new VerAck());
+                switch (mode) {
+                    case SERVER:
+                        send(new Version.Builder().defaults().addrFrom(host).addrRecv(node).build());
+                        break;
+                    case CLIENT:
+                    case SYNC:
+                        activateConnection();
+                        break;
+                    default:
+                        // NO OP
+                }
+            } else {
+                LOG.info("Received unsupported version " + version.getVersion() + ", disconnecting.");
+                disconnect();
+            }
+        }
     }
 
     private boolean checkOpenRequests() {
@@ -450,10 +470,10 @@ class Connection {
             try (Socket socket = Connection.this.socket) {
                 initSocket(socket);
                 while (state != DISCONNECTED) {
-                    if (!sendingQueue.isEmpty()) {
-                        send(sendingQueue.poll());
-                    } else {
+                    if (sendingQueue.isEmpty()) {
                         Thread.sleep(1000);
+                    } else {
+                        send(sendingQueue.poll());
                     }
                 }
             } catch (IOException | InterruptedException e) {

From ead5341b2e24d20eb305c36408efcaa5c678ccf8 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Thu, 31 Mar 2016 20:04:23 +0200
Subject: [PATCH 24/87] Some code for supporting chans

---
 .../dissem/bitmessage/BitmessageContext.java  | 19 +++++++----
 .../bitmessage/entity/BitmessageAddress.java  | 26 +++++++++++++++
 .../entity/valueobject/PrivateKey.java        | 33 +++++++++++++++----
 .../ch/dissem/bitmessage/utils/Encode.java    | 30 ++++++++++++++++-
 .../bitmessage/BitmessageContextTest.java     | 19 ++++++++++-
 .../entity/BitmessageAddressTest.java         |  5 ++-
 6 files changed, 115 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 9f03926..2b68f57 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -17,10 +17,7 @@
 package ch.dissem.bitmessage;
 
 import ch.dissem.bitmessage.entity.*;
-import ch.dissem.bitmessage.entity.payload.Broadcast;
-import ch.dissem.bitmessage.entity.payload.Msg;
-import ch.dissem.bitmessage.entity.payload.ObjectPayload;
-import ch.dissem.bitmessage.entity.payload.ObjectType;
+import ch.dissem.bitmessage.entity.payload.*;
 import ch.dissem.bitmessage.entity.payload.Pubkey.Feature;
 import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
@@ -117,9 +114,17 @@ public class BitmessageContext {
         return identity;
     }
 
-    public void addDistributedMailingList(String address, String alias) {
-        // TODO
-        throw new ApplicationException("not implemented");
+    public BitmessageAddress joinChan(String passphrase, String address) {
+        BitmessageAddress chan = BitmessageAddress.chan(address, passphrase);
+        ctx.getAddressRepository().save(chan);
+        return chan;
+    }
+
+    public BitmessageAddress createChan(String passphrase) {
+        // FIXME: hardcoded stream number
+        BitmessageAddress chan = BitmessageAddress.chan(1, passphrase);
+        ctx.getAddressRepository().save(chan);
+        return chan;
     }
 
     public void broadcast(final BitmessageAddress from, final String subject, final String message) {
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
index 62fabc3..ff44d0f 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
@@ -57,6 +57,7 @@ public class BitmessageAddress implements Serializable {
 
     private String alias;
     private boolean subscribed;
+    private boolean chan;
 
     BitmessageAddress(long version, long stream, byte[] ripe) {
         try {
@@ -93,6 +94,27 @@ public class BitmessageAddress implements Serializable {
         this.pubkey = publicKey;
     }
 
+    public BitmessageAddress(String address, String passphrase) {
+        this(address);
+        this.privateKey = new PrivateKey(this, passphrase);
+        if (!Arrays.equals(ripe, privateKey.getPubkey().getRipe())) {
+            throw new IllegalArgumentException("Wrong address or passphrase");
+        }
+    }
+
+    public static BitmessageAddress chan(String address, String passphrase) {
+        BitmessageAddress result = new BitmessageAddress(address, passphrase);
+        result.chan = true;
+        return result;
+    }
+
+    public static BitmessageAddress chan(long stream, String passphrase) {
+        PrivateKey privateKey = new PrivateKey(Pubkey.LATEST_VERSION, stream, passphrase);
+        BitmessageAddress result = new BitmessageAddress(privateKey);
+        result.chan = true;
+        return result;
+    }
+
     public BitmessageAddress(PrivateKey privateKey) {
         this(privateKey.getPubkey());
         this.privateKey = privateKey;
@@ -221,4 +243,8 @@ public class BitmessageAddress implements Serializable {
     public void setSubscribed(boolean subscribed) {
         this.subscribed = subscribed;
     }
+
+    public boolean isChan() {
+        return chan;
+    }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
index e058308..6348add 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
@@ -16,6 +16,7 @@
 
 package ch.dissem.bitmessage.entity.valueobject;
 
+import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.Streamable;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.exception.ApplicationException;
@@ -64,14 +65,32 @@ public class PrivateKey implements Streamable {
         this.pubkey = pubkey;
     }
 
-    public PrivateKey(long version, long stream, String passphrase, long nonceTrialsPerByte, long extraBytes, Pubkey.Feature... features) {
+    public PrivateKey(BitmessageAddress address, String passphrase) {
+        this(address.getVersion(), address.getStream(), passphrase);
+    }
+
+    public PrivateKey(long version, long stream, String passphrase) {
         try {
-            // FIXME: this is most definitely wrong
-            this.privateSigningKey = Bytes.truncate(security().sha512(passphrase.getBytes("UTF-8"), new byte[]{0}), 32);
-            this.privateEncryptionKey = Bytes.truncate(security().sha512(passphrase.getBytes("UTF-8"), new byte[]{1}), 32);
-            this.pubkey = security().createPubkey(version, stream, privateSigningKey, privateEncryptionKey,
-                    nonceTrialsPerByte, extraBytes, features);
-        } catch (UnsupportedEncodingException e) {
+            byte[] signingKey;
+            int signingKeyNonce = 0;
+            byte[] encryptionKey;
+            int encryptionKeyNonce = 1;
+            byte[] passPhraseBytes = passphrase.getBytes("UTF-8");
+            byte[] ripe;
+            do {
+                signingKey = Bytes.truncate(security().sha512(passPhraseBytes, Encode.varInt(signingKeyNonce)), 32);
+                encryptionKey = Bytes.truncate(security().sha512(passPhraseBytes, Encode.varInt(encryptionKeyNonce)), 32);
+                byte[] publicSigningKey = security().createPublicKey(signingKey);
+                byte[] publicEncryptionKey = security().createPublicKey(encryptionKey);
+                ripe = security().ripemd160(security().sha512(publicSigningKey, publicEncryptionKey));
+
+                signingKeyNonce += 2;
+                encryptionKeyNonce += 2;
+            } while (ripe[0] != 0);
+            this.privateSigningKey = signingKey;
+            this.privateEncryptionKey = encryptionKey;
+            this.pubkey = security().createPubkey(version, stream, privateSigningKey, privateEncryptionKey, 0, 0);
+        } catch (IOException e) {
             throw new ApplicationException(e);
         }
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/utils/Encode.java b/core/src/main/java/ch/dissem/bitmessage/utils/Encode.java
index 2cdc262..f5eac43 100644
--- a/core/src/main/java/ch/dissem/bitmessage/utils/Encode.java
+++ b/core/src/main/java/ch/dissem/bitmessage/utils/Encode.java
@@ -41,6 +41,34 @@ public class Encode {
         varInt(value, stream, null);
     }
 
+    public static byte[] varInt(long value) throws IOException {
+        final byte[] result;
+        if (value < 0) {
+            // This is due to the fact that Java doesn't really support unsigned values.
+            // Please be aware that this might be an error due to a smaller negative value being cast to long.
+            // Normally, negative values shouldn't occur within the protocol, and I large enough longs
+            // to being recognized as negatives aren't realistic.
+            ByteBuffer buffer = ByteBuffer.allocate(9);
+            buffer.put((byte) 0xff);
+            result = buffer.putLong(value).array();
+        } else if (value < 0xfd) {
+            result = new byte[]{(byte) value};
+        } else if (value <= 0xffffL) {
+            ByteBuffer buffer = ByteBuffer.allocate(3);
+            buffer.put((byte) 0xfd);
+            result = buffer.putShort((short) value).array();
+        } else if (value <= 0xffffffffL) {
+            ByteBuffer buffer = ByteBuffer.allocate(5);
+            buffer.put((byte) 0xfe);
+            result = buffer.putInt((int) value).array();
+        } else {
+            ByteBuffer buffer = ByteBuffer.allocate(9);
+            buffer.put((byte) 0xff);
+            result = buffer.putLong(value).array();
+        }
+        return result;
+    }
+
     public static void varInt(long value, OutputStream stream, AccessCounter counter) throws IOException {
         if (value < 0) {
             // This is due to the fact that Java doesn't really support unsigned values.
@@ -81,7 +109,7 @@ public class Encode {
     }
 
     public static void int16(long value, OutputStream stream, AccessCounter counter) throws IOException {
-        stream.write(ByteBuffer.allocate(4).putInt((int) value).array(), 2, 2);
+        stream.write(ByteBuffer.allocate(2).putShort((short) value).array());
         inc(counter, 2);
     }
 
diff --git a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
index 890c2c3..a1991f8 100644
--- a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
@@ -39,7 +39,7 @@ import static ch.dissem.bitmessage.entity.payload.ObjectType.*;
 import static ch.dissem.bitmessage.utils.MessageMatchers.object;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
@@ -206,4 +206,21 @@ public class BitmessageContextTest {
                 .build();
         ctx.send(msg);
     }
+
+    @Test
+    public void ensureChanIsJoined() {
+        String chanAddress = "BM-2cW67GEKkHGonXKZLCzouLLxnLym3azS8r";
+        BitmessageAddress chan = ctx.joinChan("general", chanAddress);
+        assertNotNull(chan);
+        assertEquals(chan.getAddress(), chanAddress);
+        assertTrue(chan.isChan());
+    }
+
+    @Test
+    public void ensureChanIsCreated() {
+        BitmessageAddress chan = ctx.createChan("test");
+        assertNotNull(chan);
+        assertEquals(chan.getVersion(), Pubkey.LATEST_VERSION);
+        assertTrue(chan.isChan());
+    }
 }
diff --git a/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java b/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
index 495aea9..9b22589 100644
--- a/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
@@ -20,7 +20,10 @@ import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.payload.V4Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
-import ch.dissem.bitmessage.utils.*;
+import ch.dissem.bitmessage.utils.Base58;
+import ch.dissem.bitmessage.utils.Bytes;
+import ch.dissem.bitmessage.utils.Strings;
+import ch.dissem.bitmessage.utils.TestUtils;
 import org.junit.Test;
 
 import java.io.IOException;

From 32ea3517fe7a9f34caa8cb57ae214cea04b3baa2 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Thu, 7 Apr 2016 17:24:56 +0200
Subject: [PATCH 25/87] Chans should now work. Other deterministic addresses
 should be easy to implement, but aren't done yet

---
 .../dissem/bitmessage/BitmessageContext.java  |  1 +
 .../bitmessage/DefaultMessageListener.java    |  2 +-
 .../bitmessage/entity/BitmessageAddress.java  |  4 +++
 .../bitmessage/ports/AddressRepository.java   |  7 +++-
 .../dissem/bitmessage/demo/Application.java   | 33 ++++++++++++++-----
 .../repository/JdbcAddressRepository.java     | 18 +++++++---
 .../migration/V3.0__Update_table_address.sql  |  1 +
 .../repository/JdbcAddressRepositoryTest.java | 20 ++++++++++-
 8 files changed, 70 insertions(+), 16 deletions(-)
 create mode 100644 repositories/src/main/resources/db/migration/V3.0__Update_table_address.sql

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 2b68f57..6348bcc 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -116,6 +116,7 @@ public class BitmessageContext {
 
     public BitmessageAddress joinChan(String passphrase, String address) {
         BitmessageAddress chan = BitmessageAddress.chan(address, passphrase);
+        chan.setAlias(passphrase);
         ctx.getAddressRepository().save(chan);
         return chan;
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
index d209974..c2c2f64 100644
--- a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
+++ b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
@@ -73,7 +73,7 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
 
     protected void receive(ObjectMessage object, GetPubkey getPubkey) {
         BitmessageAddress identity = ctx.getAddressRepository().findIdentity(getPubkey.getRipeTag());
-        if (identity != null && identity.getPrivateKey() != null) {
+        if (identity != null && identity.getPrivateKey() != null && !identity.isChan()) {
             LOG.info("Got pubkey request for identity " + identity);
             // FIXME: only send pubkey if it wasn't sent in the last 28 days
             ctx.sendPubkey(identity, object.getStream());
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
index ff44d0f..229da14 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
@@ -247,4 +247,8 @@ public class BitmessageAddress implements Serializable {
     public boolean isChan() {
         return chan;
     }
+
+    public void setChan(boolean chan) {
+        this.chan = chan;
+    }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/AddressRepository.java b/core/src/main/java/ch/dissem/bitmessage/ports/AddressRepository.java
index 2770997..ff397ba 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/AddressRepository.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/AddressRepository.java
@@ -30,12 +30,17 @@ public interface AddressRepository {
      */
     List<BitmessageAddress> getIdentities();
 
+    /**
+     * @return all subscribed chans.
+     */
+    List<BitmessageAddress> getChans();
+
     List<BitmessageAddress> getSubscriptions();
 
     List<BitmessageAddress> getSubscriptions(long broadcastVersion);
 
     /**
-     * @return all Bitmessage addresses that have no private key.
+     * @return all Bitmessage addresses that have no private key or are chans.
      */
     List<BitmessageAddress> getContacts();
 
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
index a6a6e1f..f480785 100644
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
@@ -54,14 +54,11 @@ public class Application {
                 .networkHandler(new DefaultNetworkHandler())
                 .cryptography(new BouncyCryptography())
                 .port(48444)
-                .listener(new BitmessageContext.Listener() {
-                    @Override
-                    public void receive(Plaintext plaintext) {
-                        try {
-                            System.out.println(new String(plaintext.getMessage(), "UTF-8"));
-                        } catch (UnsupportedEncodingException e) {
-                            LOG.error(e.getMessage(), e);
-                        }
+                .listener(plaintext -> {
+                    try {
+                        System.out.println(new String(plaintext.getMessage(), "UTF-8"));
+                    } catch (UnsupportedEncodingException e) {
+                        LOG.error(e.getMessage(), e);
                     }
                 })
                 .build();
@@ -136,6 +133,7 @@ public class Application {
             System.out.println();
             commandLine.listAddresses(identities, "identities");
             System.out.println("a) create identity");
+            System.out.println("c) join chan");
             System.out.println(COMMAND_BACK);
 
             command = commandLine.nextCommand();
@@ -144,6 +142,10 @@ public class Application {
                     addIdentity();
                     identities = ctx.addresses().getIdentities();
                     break;
+                case "c":
+                    joinChan();
+                    identities = ctx.addresses().getIdentities();
+                    break;
                 case "b":
                     return;
                 default:
@@ -168,6 +170,15 @@ public class Application {
         ctx.addresses().save(identity);
     }
 
+    private void joinChan() {
+        System.out.println();
+        System.out.print("Passphrase: ");
+        String passphrase = commandLine.nextLine();
+        System.out.print("Address: ");
+        String address = commandLine.nextLineTrimmed();
+        ctx.joinChan(passphrase, address);
+    }
+
     private void contacts() {
         String command;
         List<BitmessageAddress> contacts = ctx.addresses().getContacts();
@@ -258,6 +269,12 @@ public class Application {
             } else {
                 System.out.println("Public key available");
             }
+        } else {
+            if (address.isChan()) {
+                System.out.println("Chan");
+            } else {
+                System.out.println("Identity");
+            }
         }
     }
 
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java
index 2cbd8c7..5422997 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcAddressRepository.java
@@ -70,6 +70,11 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
         return find("private_key IS NOT NULL");
     }
 
+    @Override
+    public List<BitmessageAddress> getChans() {
+        return find("chan = '1'");
+    }
+
     @Override
     public List<BitmessageAddress> getSubscriptions() {
         return find("subscribed = '1'");
@@ -86,7 +91,7 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
 
     @Override
     public List<BitmessageAddress> getContacts() {
-        return find("private_key IS NULL");
+        return find("private_key IS NULL OR chan = '1'");
     }
 
     private List<BitmessageAddress> find(String where) {
@@ -94,7 +99,7 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
         try (
                 Connection connection = config.getConnection();
                 Statement stmt = connection.createStatement();
-                ResultSet rs = stmt.executeQuery("SELECT address, alias, public_key, private_key, subscribed " +
+                ResultSet rs = stmt.executeQuery("SELECT address, alias, public_key, private_key, subscribed, chan " +
                         "FROM Address WHERE " + where)
         ) {
             while (rs.next()) {
@@ -118,6 +123,7 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
                 }
                 address.setAlias(rs.getString("alias"));
                 address.setSubscribed(rs.getBoolean("subscribed"));
+                address.setChan(rs.getBoolean("chan"));
 
                 result.add(address);
             }
@@ -164,7 +170,7 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
         if (address.getPrivateKey() != null) {
             statement.append(", private_key=?");
         }
-        statement.append(", subscribed=? WHERE address=?");
+        statement.append(", subscribed=?, chan=? WHERE address=?");
         try (
                 Connection connection = config.getConnection();
                 PreparedStatement ps = connection.prepareStatement(statement.toString())
@@ -178,6 +184,7 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
                 writeBlob(ps, ++i, address.getPrivateKey());
             }
             ps.setBoolean(++i, address.isSubscribed());
+            ps.setBoolean(++i, address.isChan());
             ps.setString(++i, address.getAddress());
             ps.executeUpdate();
         }
@@ -187,8 +194,8 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
         try (
                 Connection connection = config.getConnection();
                 PreparedStatement ps = connection.prepareStatement(
-                        "INSERT INTO Address (address, version, alias, public_key, private_key, subscribed) " +
-                                "VALUES (?, ?, ?, ?, ?, ?)")
+                        "INSERT INTO Address (address, version, alias, public_key, private_key, subscribed, chan) " +
+                                "VALUES (?, ?, ?, ?, ?, ?, ?)")
         ) {
             ps.setString(1, address.getAddress());
             ps.setLong(2, address.getVersion());
@@ -196,6 +203,7 @@ public class JdbcAddressRepository extends JdbcHelper implements AddressReposito
             writePubkey(ps, 4, address.getPubkey());
             writeBlob(ps, 5, address.getPrivateKey());
             ps.setBoolean(6, address.isSubscribed());
+            ps.setBoolean(7, address.isChan());
             ps.executeUpdate();
         }
     }
diff --git a/repositories/src/main/resources/db/migration/V3.0__Update_table_address.sql b/repositories/src/main/resources/db/migration/V3.0__Update_table_address.sql
new file mode 100644
index 0000000..01e036b
--- /dev/null
+++ b/repositories/src/main/resources/db/migration/V3.0__Update_table_address.sql
@@ -0,0 +1 @@
+ALTER TABLE Address ADD COLUMN chan BIT NOT NULL DEFAULT '0';
diff --git a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcAddressRepositoryTest.java b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcAddressRepositoryTest.java
index 18e70b2..bd91329 100644
--- a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcAddressRepositoryTest.java
+++ b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcAddressRepositoryTest.java
@@ -95,7 +95,7 @@ public class JdbcAddressRepositoryTest extends TestBase {
         addSubscription("BM-2D9QKN4teYRvoq2fyzpiftPh9WP9qggtzh");
 
         List<BitmessageAddress> subscriptions;
-        
+
         subscriptions = repo.getSubscriptions(5);
         assertEquals(1, subscriptions.size());
 
@@ -137,6 +137,24 @@ public class JdbcAddressRepositoryTest extends TestBase {
         assertNotNull(identityA.getPubkey());
         assertNotNull(identityA.getPrivateKey());
         assertEquals("Test", identityA.getAlias());
+        assertFalse(identityA.isChan());
+    }
+
+    @Test
+    public void ensureNewChanIsSavedAndUpdated() {
+        BitmessageAddress chan = BitmessageAddress.chan(1, "test");
+        repo.save(chan);
+        BitmessageAddress address = repo.getAddress(chan.getAddress());
+        assertNotNull(address);
+        assertTrue(address.isChan());
+
+        address.setAlias("Test");
+        repo.save(address);
+
+        address = repo.getAddress(chan.getAddress());
+        assertNotNull(address);
+        assertTrue(address.isChan());
+        assertEquals("Test", address.getAlias());
     }
 
     @Test

From f70c15da382294e2e5ce46704d5e179bde26a881 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Thu, 7 Apr 2016 23:01:16 +0200
Subject: [PATCH 26/87] Some code for deterministic addresses - needs tests

---
 .../dissem/bitmessage/BitmessageContext.java  | 13 +++
 .../bitmessage/entity/BitmessageAddress.java  | 14 +++
 .../entity/valueobject/InventoryVector.java   |  4 +-
 .../bitmessage/entity/valueobject/Label.java  |  2 +
 .../entity/valueobject/NetworkAddress.java    |  2 +
 .../entity/valueobject/PrivateKey.java        | 90 ++++++++++++++-----
 .../ch/dissem/bitmessage/utils/Base58.java    |  2 +-
 7 files changed, 104 insertions(+), 23 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 6348bcc..8377e22 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -31,6 +31,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.net.InetAddress;
+import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.*;
@@ -128,6 +129,18 @@ public class BitmessageContext {
         return chan;
     }
 
+    public List<BitmessageAddress> createDeterministicAddresses(
+            String passphrase, int numberOfAddresses, int version, int stream, boolean shorter) {
+        List<BitmessageAddress> result = BitmessageAddress.deterministic(
+                passphrase, numberOfAddresses, version, stream, shorter);
+        for (int i = 0; i < result.size(); i++) {
+            BitmessageAddress address = result.get(i);
+            address.setAlias(passphrase + " (" + (i + 1) + ")");
+            ctx.getAddressRepository().save(address);
+        }
+        return result;
+    }
+
     public void broadcast(final BitmessageAddress from, final String subject, final String message) {
         Plaintext msg = new Plaintext.Builder(BROADCAST)
                 .from(from)
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
index 229da14..2458854 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
@@ -29,7 +29,9 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Objects;
 
 import static ch.dissem.bitmessage.utils.Decode.bytes;
@@ -41,6 +43,8 @@ import static ch.dissem.bitmessage.utils.Singleton.security;
  * holding private keys.
  */
 public class BitmessageAddress implements Serializable {
+    private static final long serialVersionUID = 2386328540805994064L;
+
     private final long version;
     private final long stream;
     private final byte[] ripe;
@@ -115,6 +119,16 @@ public class BitmessageAddress implements Serializable {
         return result;
     }
 
+    public static List<BitmessageAddress> deterministic(String passphrase, int numberOfAddresses,
+                                                        int version, int stream, boolean shorter) {
+        List<BitmessageAddress> result = new ArrayList<>(numberOfAddresses);
+        List<PrivateKey> privateKeys = PrivateKey.deterministic(passphrase, numberOfAddresses, version, stream, shorter);
+        for (PrivateKey pk : privateKeys) {
+            result.add(new BitmessageAddress(pk));
+        }
+        return result;
+    }
+
     public BitmessageAddress(PrivateKey privateKey) {
         this(privateKey.getPubkey());
         this.privateKey = privateKey;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/InventoryVector.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/InventoryVector.java
index fc67422..127b90a 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/InventoryVector.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/InventoryVector.java
@@ -25,6 +25,8 @@ import java.io.Serializable;
 import java.util.Arrays;
 
 public class InventoryVector implements Streamable, Serializable {
+    private static final long serialVersionUID = -7349009673063348719L;
+
     /**
      * Hash of the object
      */
@@ -42,7 +44,7 @@ public class InventoryVector implements Streamable, Serializable {
 
     @Override
     public int hashCode() {
-        return hash != null ? Arrays.hashCode(hash) : 0;
+        return hash == null ? 0 : Arrays.hashCode(hash);
     }
 
     public byte[] getHash() {
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/Label.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/Label.java
index 02f0384..facbe55 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/Label.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/Label.java
@@ -20,6 +20,8 @@ import java.io.Serializable;
 import java.util.Objects;
 
 public class Label implements Serializable {
+    private static final long serialVersionUID = 831782893630994914L;
+
     private Object id;
     private String label;
     private Type type;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
index 0637da9..d0324a4 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
@@ -31,6 +31,8 @@ import java.util.Arrays;
  * A node's address. It's written in IPv6 format.
  */
 public class NetworkAddress implements Streamable {
+    private static final long serialVersionUID = 2500120578167100300L;
+
     private long time;
 
     /**
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
index 6348add..73594ff 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
@@ -26,6 +26,8 @@ import ch.dissem.bitmessage.utils.Decode;
 import ch.dissem.bitmessage.utils.Encode;
 
 import java.io.*;
+import java.util.ArrayList;
+import java.util.List;
 
 import static ch.dissem.bitmessage.utils.Singleton.security;
 
@@ -34,7 +36,10 @@ import static ch.dissem.bitmessage.utils.Singleton.security;
  * {@link Pubkey} object.
  */
 public class PrivateKey implements Streamable {
+    private static final long serialVersionUID = 8562555470709110558L;
+
     public static final int PRIVATE_KEY_SIZE = 32;
+
     private final byte[] privateSigningKey;
     private final byte[] privateEncryptionKey;
 
@@ -70,29 +75,72 @@ public class PrivateKey implements Streamable {
     }
 
     public PrivateKey(long version, long stream, String passphrase) {
-        try {
-            byte[] signingKey;
-            int signingKeyNonce = 0;
-            byte[] encryptionKey;
-            int encryptionKeyNonce = 1;
-            byte[] passPhraseBytes = passphrase.getBytes("UTF-8");
-            byte[] ripe;
-            do {
-                signingKey = Bytes.truncate(security().sha512(passPhraseBytes, Encode.varInt(signingKeyNonce)), 32);
-                encryptionKey = Bytes.truncate(security().sha512(passPhraseBytes, Encode.varInt(encryptionKeyNonce)), 32);
-                byte[] publicSigningKey = security().createPublicKey(signingKey);
-                byte[] publicEncryptionKey = security().createPublicKey(encryptionKey);
-                ripe = security().ripemd160(security().sha512(publicSigningKey, publicEncryptionKey));
+        this(new Builder(version, stream, false).seed(passphrase).generate());
+    }
 
-                signingKeyNonce += 2;
-                encryptionKeyNonce += 2;
-            } while (ripe[0] != 0);
-            this.privateSigningKey = signingKey;
-            this.privateEncryptionKey = encryptionKey;
-            this.pubkey = security().createPubkey(version, stream, privateSigningKey, privateEncryptionKey, 0, 0);
-        } catch (IOException e) {
-            throw new ApplicationException(e);
+    private PrivateKey(Builder builder) {
+        this.privateSigningKey = builder.privSK;
+        this.privateEncryptionKey = builder.privEK;
+        this.pubkey = Factory.createPubkey(builder.version, builder.stream, builder.pubSK, builder.pubEK, 0, 0);
+    }
+
+    private static class Builder {
+        final long version;
+        final long stream;
+        final boolean shorter;
+
+        byte[] seed;
+        long nextNonce;
+
+        byte[] privSK, privEK;
+        byte[] pubSK, pubEK;
+
+        private Builder(long version, long stream, boolean shorter) {
+            this.version = version;
+            this.stream = stream;
+            this.shorter = shorter;
         }
+
+        Builder seed(String passphrase) {
+            try {
+                seed = passphrase.getBytes("UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                throw new ApplicationException(e);
+            }
+            return this;
+        }
+
+        Builder generate() {
+            try {
+                long signingKeyNonce = nextNonce;
+                long encryptionKeyNonce = nextNonce + 1;
+                byte[] ripe;
+                do {
+                    privEK = Bytes.truncate(security().sha512(seed, Encode.varInt(encryptionKeyNonce)), 32);
+                    privSK = Bytes.truncate(security().sha512(seed, Encode.varInt(signingKeyNonce)), 32);
+                    pubSK = security().createPublicKey(privSK);
+                    pubEK = security().createPublicKey(privEK);
+                    ripe = security().ripemd160(security().sha512(pubSK, pubEK));
+
+                    signingKeyNonce += 2;
+                    encryptionKeyNonce += 2;
+                } while (ripe[0] != 0 || (shorter && ripe[1] != 0));
+                nextNonce = signingKeyNonce;
+            } catch (IOException e) {
+                throw new ApplicationException(e);
+            }
+            return this;
+        }
+    }
+
+    public static List<PrivateKey> deterministic(String passphrase, int numberOfAddresses, long version, long stream, boolean shorter) {
+        List<PrivateKey> result = new ArrayList<>(numberOfAddresses);
+        Builder builder = new Builder(version, stream, shorter).seed(passphrase);
+        for (int i = 0; i < numberOfAddresses; i++) {
+            builder.generate();
+            result.add(new PrivateKey(builder));
+        }
+        return result;
     }
 
     public static PrivateKey read(InputStream is) throws IOException {
diff --git a/core/src/main/java/ch/dissem/bitmessage/utils/Base58.java b/core/src/main/java/ch/dissem/bitmessage/utils/Base58.java
index 167d862..a67e344 100644
--- a/core/src/main/java/ch/dissem/bitmessage/utils/Base58.java
+++ b/core/src/main/java/ch/dissem/bitmessage/utils/Base58.java
@@ -31,7 +31,7 @@ import static java.util.Arrays.copyOfRange;
  */
 public class Base58 {
     private static final int[] INDEXES = new int[128];
-    private static char[] ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz".toCharArray();
+    private static final char[] ALPHABET = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz".toCharArray();
 
     static {
         for (int i = 0; i < INDEXES.length; i++) {

From 4f7f80c12a9b1cb2717f1a536da554e918a352e0 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 8 Apr 2016 19:22:40 +0200
Subject: [PATCH 27/87] Added tests and code improvements

---
 .../dissem/bitmessage/BitmessageContext.java  | 10 +++--
 .../ch/dissem/bitmessage/InternalContext.java | 13 ++-----
 .../dissem/bitmessage/ProofOfWorkService.java |  6 ++-
 .../ch/dissem/bitmessage/entity/Addr.java     |  4 +-
 .../bitmessage/entity/BitmessageAddress.java  |  3 +-
 .../bitmessage/entity/CustomMessage.java      |  2 +
 .../ch/dissem/bitmessage/entity/GetData.java  |  2 +
 .../java/ch/dissem/bitmessage/entity/Inv.java |  2 +
 .../bitmessage/entity/NetworkMessage.java     |  2 +
 .../bitmessage/entity/ObjectMessage.java      |  2 +
 .../dissem/bitmessage/entity/Plaintext.java   |  2 +
 .../ch/dissem/bitmessage/entity/VerAck.java   |  2 +
 .../ch/dissem/bitmessage/entity/Version.java  |  2 +
 .../bitmessage/entity/payload/Broadcast.java  |  2 +
 .../bitmessage/entity/payload/CryptoBox.java  |  1 +
 .../entity/payload/GenericPayload.java        |  2 +
 .../bitmessage/entity/payload/GetPubkey.java  |  2 +
 .../dissem/bitmessage/entity/payload/Msg.java |  2 +
 .../entity/payload/ObjectPayload.java         |  3 +-
 .../bitmessage/entity/payload/Pubkey.java     |  2 +
 .../bitmessage/entity/payload/V2Pubkey.java   |  2 +
 .../bitmessage/entity/payload/V3Pubkey.java   |  2 +
 .../entity/payload/V4Broadcast.java           |  2 +
 .../bitmessage/entity/payload/V4Pubkey.java   |  2 +
 .../entity/payload/V5Broadcast.java           |  2 +
 .../entity/valueobject/PrivateKey.java        |  4 +-
 .../exception/AddressFormatException.java     |  2 +
 .../exception/ApplicationException.java       |  2 +
 .../exception/DecryptionFailedException.java  |  1 +
 .../InsufficientProofOfWorkException.java     |  2 +
 .../bitmessage/exception/NodeException.java   |  2 +
 .../ports/AbstractCryptography.java           | 10 +++--
 .../bitmessage/BitmessageContextTest.java     | 37 +++++++++++++++++--
 .../DefaultMessageListenerTest.java           |  2 -
 .../bitmessage/ProofOfWorkServiceTest.java    |  4 --
 .../dissem/bitmessage/utils/EncodeTest.java   |  2 +-
 .../bitmessage/utils/MessageMatchers.java     |  1 -
 .../extensions/CryptoCustomMessage.java       |  3 ++
 .../extensions/pow/ProofOfWorkRequest.java    |  2 +
 .../bitmessage/networking/Connection.java     |  4 +-
 .../networking/NetworkHandlerTest.java        |  1 -
 .../repository/JdbcNodeRegistryTest.java      |  3 +-
 .../ch/dissem/bitmessage/wif/WifExporter.java |  3 ++
 .../ch/dissem/bitmessage/wif/WifImporter.java |  3 ++
 .../bitmessage/wif/WifExporterTest.java       | 21 ++++++++++-
 .../bitmessage/wif/WifImporterTest.java       | 21 +++++++++--
 46 files changed, 163 insertions(+), 43 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 8377e22..51243ab 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -36,6 +36,8 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.*;
 
+import static ch.dissem.bitmessage.InternalContext.NETWORK_EXTRA_BYTES;
+import static ch.dissem.bitmessage.InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE;
 import static ch.dissem.bitmessage.entity.Plaintext.Status.*;
 import static ch.dissem.bitmessage.entity.Plaintext.Type.BROADCAST;
 import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
@@ -99,8 +101,8 @@ public class BitmessageContext {
         final BitmessageAddress identity = new BitmessageAddress(new PrivateKey(
                 shorter,
                 ctx.getStreams()[0],
-                ctx.getNetworkNonceTrialsPerByte(),
-                ctx.getNetworkExtraBytes(),
+                NETWORK_NONCE_TRIALS_PER_BYTE,
+                NETWORK_EXTRA_BYTES,
                 features
         ));
         ctx.getAddressRepository().save(identity);
@@ -130,12 +132,12 @@ public class BitmessageContext {
     }
 
     public List<BitmessageAddress> createDeterministicAddresses(
-            String passphrase, int numberOfAddresses, int version, int stream, boolean shorter) {
+            String passphrase, int numberOfAddresses, long version, long stream, boolean shorter) {
         List<BitmessageAddress> result = BitmessageAddress.deterministic(
                 passphrase, numberOfAddresses, version, stream, shorter);
         for (int i = 0; i < result.size(); i++) {
             BitmessageAddress address = result.get(i);
-            address.setAlias(passphrase + " (" + (i + 1) + ")");
+            address.setAlias("deterministic (" + (i + 1) + ")");
             ctx.getAddressRepository().save(address);
         }
         return result;
diff --git a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
index 33ee15b..00ec40e 100644
--- a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
@@ -43,6 +43,9 @@ import java.util.TreeSet;
 public class InternalContext {
     private final static Logger LOG = LoggerFactory.getLogger(InternalContext.class);
 
+    public final static long NETWORK_NONCE_TRIALS_PER_BYTE = 1000;
+    public final static long NETWORK_EXTRA_BYTES = 1000;
+
     private final Cryptography cryptography;
     private final Inventory inventory;
     private final NodeRegistry nodeRegistry;
@@ -58,8 +61,6 @@ public class InternalContext {
     private final TreeSet<Long> streams = new TreeSet<>();
     private final int port;
     private final long clientNonce;
-    private final long networkNonceTrialsPerByte = 1000;
-    private final long networkExtraBytes = 1000;
     private long connectionTTL;
     private int connectionLimit;
 
@@ -158,14 +159,6 @@ public class InternalContext {
         return port;
     }
 
-    public long getNetworkNonceTrialsPerByte() {
-        return networkNonceTrialsPerByte;
-    }
-
-    public long getNetworkExtraBytes() {
-        return networkExtraBytes;
-    }
-
     public void send(final BitmessageAddress from, BitmessageAddress to, final ObjectPayload payload,
                      final long timeToLive) {
         try {
diff --git a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
index ad62dde..93e461f 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
@@ -14,6 +14,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.List;
 
+import static ch.dissem.bitmessage.InternalContext.NETWORK_EXTRA_BYTES;
+import static ch.dissem.bitmessage.InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE;
 import static ch.dissem.bitmessage.utils.Singleton.security;
 
 /**
@@ -45,8 +47,8 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
     public void doProofOfWork(BitmessageAddress recipient, ObjectMessage object) {
         Pubkey pubkey = recipient == null ? null : recipient.getPubkey();
 
-        long nonceTrialsPerByte = pubkey == null ? ctx.getNetworkNonceTrialsPerByte() : pubkey.getNonceTrialsPerByte();
-        long extraBytes = pubkey == null ? ctx.getNetworkExtraBytes() : pubkey.getExtraBytes();
+        long nonceTrialsPerByte = pubkey == null ? NETWORK_NONCE_TRIALS_PER_BYTE : pubkey.getNonceTrialsPerByte();
+        long extraBytes = pubkey == null ? NETWORK_EXTRA_BYTES : pubkey.getExtraBytes();
 
         powRepo.putObject(object, nonceTrialsPerByte, extraBytes);
         if (object.getPayload() instanceof PlaintextHolder) {
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Addr.java b/core/src/main/java/ch/dissem/bitmessage/entity/Addr.java
index 2c0eb3e..6125910 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Addr.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Addr.java
@@ -29,6 +29,8 @@ import java.util.List;
  * The 'addr' command holds a list of known active Bitmessage nodes.
  */
 public class Addr implements MessagePayload {
+    private static final long serialVersionUID = -5117688017050138720L;
+
     private final List<NetworkAddress> addresses;
 
     private Addr(Builder builder) {
@@ -53,7 +55,7 @@ public class Addr implements MessagePayload {
     }
 
     public static final class Builder {
-        private List<NetworkAddress> addresses = new ArrayList<NetworkAddress>();
+        private List<NetworkAddress> addresses = new ArrayList<>();
 
         public Builder addresses(Collection<NetworkAddress> addresses){
             this.addresses.addAll(addresses);
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
index 2458854..7868efd 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
@@ -101,6 +101,7 @@ public class BitmessageAddress implements Serializable {
     public BitmessageAddress(String address, String passphrase) {
         this(address);
         this.privateKey = new PrivateKey(this, passphrase);
+        this.pubkey = this.privateKey.getPubkey();
         if (!Arrays.equals(ripe, privateKey.getPubkey().getRipe())) {
             throw new IllegalArgumentException("Wrong address or passphrase");
         }
@@ -120,7 +121,7 @@ public class BitmessageAddress implements Serializable {
     }
 
     public static List<BitmessageAddress> deterministic(String passphrase, int numberOfAddresses,
-                                                        int version, int stream, boolean shorter) {
+                                                        long version, long stream, boolean shorter) {
         List<BitmessageAddress> result = new ArrayList<>(numberOfAddresses);
         List<PrivateKey> privateKeys = PrivateKey.deterministic(passphrase, numberOfAddresses, version, stream, shorter);
         for (PrivateKey pk : privateKeys) {
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java
index ffdb9b2..e43f56d 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java
@@ -29,6 +29,8 @@ import static ch.dissem.bitmessage.utils.Decode.varString;
  * @author Christian Basler
  */
 public class CustomMessage implements MessagePayload {
+    private static final long serialVersionUID = -8932056829480326011L;
+
     public static final String COMMAND_ERROR = "ERROR";
 
     private final String command;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/GetData.java b/core/src/main/java/ch/dissem/bitmessage/entity/GetData.java
index 9569929..44fab5b 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/GetData.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/GetData.java
@@ -28,6 +28,8 @@ import java.util.List;
  * The 'getdata' command is used to request objects from a node.
  */
 public class GetData implements MessagePayload {
+    private static final long serialVersionUID = 1433878785969631061L;
+
     public static final int MAX_INVENTORY_SIZE = 50_000;
 
     List<InventoryVector> inventory;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Inv.java b/core/src/main/java/ch/dissem/bitmessage/entity/Inv.java
index 7130fd7..fd2d40d 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Inv.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Inv.java
@@ -28,6 +28,8 @@ import java.util.List;
  * The 'inv' command holds up to 50000 inventory vectors, i.e. hashes of inventory items.
  */
 public class Inv implements MessagePayload {
+    private static final long serialVersionUID = 3662992522956947145L;
+
     private List<InventoryVector> inventory;
 
     private Inv(Builder builder) {
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
index 5e8552e..347af6c 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
@@ -33,6 +33,8 @@ import static ch.dissem.bitmessage.utils.Singleton.security;
  * A network message is exchanged between two nodes.
  */
 public class NetworkMessage implements Streamable {
+    private static final long serialVersionUID = 702708857104464809L;
+
     /**
      * Magic value indicating message origin network, and used to seek to next message when stream state is unknown
      */
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
index 89ddddb..68aa5ac 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
@@ -36,6 +36,8 @@ import static ch.dissem.bitmessage.utils.Singleton.security;
  * The 'object' command sends an object that is shared throughout the network.
  */
 public class ObjectMessage implements MessagePayload {
+    private static final long serialVersionUID = 2495752480120659139L;
+
     private byte[] nonce;
     private long expiresTime;
     private long objectType;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
index fe8b1d3..034f2da 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
@@ -31,6 +31,8 @@ import java.util.*;
  * The unencrypted message to be sent by 'msg' or 'broadcast'.
  */
 public class Plaintext implements Streamable {
+    private static final long serialVersionUID = -5325729856394951079L;
+
     private final Type type;
     private final BitmessageAddress from;
     private final long encoding;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/VerAck.java b/core/src/main/java/ch/dissem/bitmessage/entity/VerAck.java
index 1aad501..815a20f 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/VerAck.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/VerAck.java
@@ -23,6 +23,8 @@ import java.io.OutputStream;
  * The 'verack' command answers a 'version' command, accepting the other node's version.
  */
 public class VerAck implements MessagePayload {
+    private static final long serialVersionUID = -4302074845199181687L;
+
     @Override
     public Command getCommand() {
         return Command.VERACK;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Version.java b/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
index 6d24d92..3722528 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
@@ -29,6 +29,8 @@ import java.util.Random;
  * The 'version' command advertises this node's latest supported protocol version upon initiation.
  */
 public class Version implements MessagePayload {
+    private static final long serialVersionUID = 7219240857343176567L;
+
     /**
      * Identifies protocol version being used by the node. Should equal 3. Nodes should disconnect if the remote node's
      * version is lower but continue with the connection if it is higher.
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java
index 47bf539..7e19e8f 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java
@@ -32,6 +32,8 @@ import static ch.dissem.bitmessage.utils.Singleton.security;
  * Broadcasts are version 4 or 5.
  */
 public abstract class Broadcast extends ObjectPayload implements Encrypted, PlaintextHolder {
+    private static final long serialVersionUID = 4064521827582239069L;
+
     protected final long stream;
     protected CryptoBox encrypted;
     protected Plaintext plaintext;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
index 8887fea..6609070 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
@@ -31,6 +31,7 @@ import static ch.dissem.bitmessage.utils.Singleton.security;
 
 
 public class CryptoBox implements Streamable {
+    private static final long serialVersionUID = 7217659539975573852L;
     private static final Logger LOG = LoggerFactory.getLogger(CryptoBox.class);
 
     private final byte[] initializationVector;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
index 7051814..66cc296 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
@@ -28,6 +28,8 @@ import java.util.Arrays;
  * have to know what it is.
  */
 public class GenericPayload extends ObjectPayload {
+    private static final long serialVersionUID = -912314085064185940L;
+
     private long stream;
     private byte[] data;
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/GetPubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/GetPubkey.java
index e31dbe3..06e623a 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/GetPubkey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/GetPubkey.java
@@ -27,6 +27,8 @@ import java.io.OutputStream;
  * Request for a public key.
  */
 public class GetPubkey extends ObjectPayload {
+    private static final long serialVersionUID = -3634516646972610180L;
+
     private long stream;
     private byte[] ripeTag;
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
index 52c36e7..8974ce3 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
@@ -31,6 +31,8 @@ import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
  * Used for person-to-person messages.
  */
 public class Msg extends ObjectPayload implements Encrypted, PlaintextHolder {
+    private static final long serialVersionUID = 4327495048296365733L;
+
     private long stream;
     private CryptoBox encrypted;
     private Plaintext plaintext;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java
index 0ca45cd..33da28d 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java
@@ -21,12 +21,13 @@ import ch.dissem.bitmessage.entity.Streamable;
 
 import java.io.IOException;
 import java.io.OutputStream;
-import java.io.Serializable;
 
 /**
  * The payload of an 'object' command. This is shared by the network.
  */
 public abstract class ObjectPayload implements Streamable {
+    private static final long serialVersionUID = -5034977402902364482L;
+
     private final long version;
 
     protected ObjectPayload(long version) {
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
index 1243b32..dec339d 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
@@ -26,6 +26,8 @@ import static ch.dissem.bitmessage.utils.Singleton.security;
  * Public keys for signing and encryption, the answer to a 'getpubkey' request.
  */
 public abstract class Pubkey extends ObjectPayload {
+    private static final long serialVersionUID = -6634533361454999619L;
+
     public final static long LATEST_VERSION = 4;
 
     protected Pubkey(long version) {
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java
index d915941..0eceb91 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java
@@ -27,6 +27,8 @@ import java.io.OutputStream;
  * A version 2 public key.
  */
 public class V2Pubkey extends Pubkey {
+    private static final long serialVersionUID = -257598690676510460L;
+
     protected long stream;
     protected int behaviorBitfield;
     protected byte[] publicSigningKey; // 64 Bytes
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V3Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V3Pubkey.java
index a3b4da2..72358d0 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V3Pubkey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V3Pubkey.java
@@ -29,6 +29,8 @@ import java.util.Objects;
  * A version 3 public key.
  */
 public class V3Pubkey extends V2Pubkey {
+    private static final long serialVersionUID = 6958853116648528319L;
+
     long nonceTrialsPerByte;
     long extraBytes;
     byte[] signature;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Broadcast.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Broadcast.java
index 39127a8..7781455 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Broadcast.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Broadcast.java
@@ -28,6 +28,8 @@ import java.io.OutputStream;
  * Broadcasts are version 4 or 5.
  */
 public class V4Broadcast extends Broadcast {
+    private static final long serialVersionUID = 195663108282762711L;
+
     protected V4Broadcast(long version, long stream, CryptoBox encrypted, Plaintext plaintext) {
         super(version, stream, encrypted, plaintext);
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Pubkey.java
index 048e7a6..8aa0ee4 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Pubkey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Pubkey.java
@@ -33,6 +33,8 @@ import java.util.Arrays;
  * to create messages to be used in spam or in flooding attacks.
  */
 public class V4Pubkey extends Pubkey implements Encrypted {
+    private static final long serialVersionUID = 1556710353694033093L;
+
     private long stream;
     private byte[] tag;
     private CryptoBox encrypted;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V5Broadcast.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V5Broadcast.java
index c12aae0..8f07a30 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V5Broadcast.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V5Broadcast.java
@@ -28,6 +28,8 @@ import java.io.OutputStream;
  * Users who are subscribed to the sending address will see the message appear in their inbox.
  */
 public class V5Broadcast extends V4Broadcast {
+    private static final long serialVersionUID = 920649721626968644L;
+
     private byte[] tag;
 
     private V5Broadcast(long stream, byte[] tag, CryptoBox encrypted) {
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
index 73594ff..b9c3afb 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
@@ -16,6 +16,7 @@
 
 package ch.dissem.bitmessage.entity.valueobject;
 
+import ch.dissem.bitmessage.InternalContext;
 import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.Streamable;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
@@ -81,7 +82,8 @@ public class PrivateKey implements Streamable {
     private PrivateKey(Builder builder) {
         this.privateSigningKey = builder.privSK;
         this.privateEncryptionKey = builder.privEK;
-        this.pubkey = Factory.createPubkey(builder.version, builder.stream, builder.pubSK, builder.pubEK, 0, 0);
+        this.pubkey = Factory.createPubkey(builder.version, builder.stream, builder.pubSK, builder.pubEK,
+                InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE, InternalContext.NETWORK_EXTRA_BYTES);
     }
 
     private static class Builder {
diff --git a/core/src/main/java/ch/dissem/bitmessage/exception/AddressFormatException.java b/core/src/main/java/ch/dissem/bitmessage/exception/AddressFormatException.java
index 7da990a..9f6674d 100644
--- a/core/src/main/java/ch/dissem/bitmessage/exception/AddressFormatException.java
+++ b/core/src/main/java/ch/dissem/bitmessage/exception/AddressFormatException.java
@@ -20,6 +20,8 @@ package ch.dissem.bitmessage.exception;
  * Indicates an illegal Bitmessage address
  */
 public class AddressFormatException extends RuntimeException {
+    private static final long serialVersionUID = 6943764578672021573L;
+
     public AddressFormatException(String message) {
         super(message);
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/exception/ApplicationException.java b/core/src/main/java/ch/dissem/bitmessage/exception/ApplicationException.java
index c381410..e688cb1 100644
--- a/core/src/main/java/ch/dissem/bitmessage/exception/ApplicationException.java
+++ b/core/src/main/java/ch/dissem/bitmessage/exception/ApplicationException.java
@@ -20,6 +20,8 @@ package ch.dissem.bitmessage.exception;
  * @author Christian Basler
  */
 public class ApplicationException extends RuntimeException {
+    private static final long serialVersionUID = 1796776684126759324L;
+
     public ApplicationException(Throwable cause) {
         super(cause);
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/exception/DecryptionFailedException.java b/core/src/main/java/ch/dissem/bitmessage/exception/DecryptionFailedException.java
index c68a050..c9e3efd 100644
--- a/core/src/main/java/ch/dissem/bitmessage/exception/DecryptionFailedException.java
+++ b/core/src/main/java/ch/dissem/bitmessage/exception/DecryptionFailedException.java
@@ -17,4 +17,5 @@
 package ch.dissem.bitmessage.exception;
 
 public class DecryptionFailedException extends Exception {
+    private static final long serialVersionUID = 3241116253113872731L;
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/exception/InsufficientProofOfWorkException.java b/core/src/main/java/ch/dissem/bitmessage/exception/InsufficientProofOfWorkException.java
index 685e710..94a5d84 100644
--- a/core/src/main/java/ch/dissem/bitmessage/exception/InsufficientProofOfWorkException.java
+++ b/core/src/main/java/ch/dissem/bitmessage/exception/InsufficientProofOfWorkException.java
@@ -22,6 +22,8 @@ import java.io.IOException;
 import java.util.Arrays;
 
 public class InsufficientProofOfWorkException extends IOException {
+    private static final long serialVersionUID = 9105580366564571318L;
+
     public InsufficientProofOfWorkException(byte[] target, byte[] hash) {
         super("Insufficient proof of work: " + Strings.hex(target) + " required, " + Strings.hex(Arrays.copyOfRange(hash, 0, 8)) + " achieved.");
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/exception/NodeException.java b/core/src/main/java/ch/dissem/bitmessage/exception/NodeException.java
index 9ab2b7f..cecd950 100644
--- a/core/src/main/java/ch/dissem/bitmessage/exception/NodeException.java
+++ b/core/src/main/java/ch/dissem/bitmessage/exception/NodeException.java
@@ -22,6 +22,8 @@ package ch.dissem.bitmessage.exception;
  * @author Ch. Basler
  */
 public class NodeException extends RuntimeException {
+    private static final long serialVersionUID = 2965325796118227802L;
+
     public NodeException(String message) {
         super(message);
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java b/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
index 81252d5..3b08377 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
@@ -35,6 +35,8 @@ import java.security.GeneralSecurityException;
 import java.security.MessageDigest;
 import java.security.SecureRandom;
 
+import static ch.dissem.bitmessage.InternalContext.NETWORK_EXTRA_BYTES;
+import static ch.dissem.bitmessage.InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE;
 import static ch.dissem.bitmessage.utils.Numbers.max;
 
 /**
@@ -99,8 +101,8 @@ public abstract class AbstractCryptography implements Cryptography, InternalCont
 
     public void doProofOfWork(ObjectMessage object, long nonceTrialsPerByte,
                               long extraBytes, ProofOfWorkEngine.Callback callback) {
-        nonceTrialsPerByte = max(nonceTrialsPerByte, context.getNetworkNonceTrialsPerByte());
-        extraBytes = max(extraBytes, context.getNetworkExtraBytes());
+        nonceTrialsPerByte = max(nonceTrialsPerByte, NETWORK_NONCE_TRIALS_PER_BYTE);
+        extraBytes = max(extraBytes, NETWORK_EXTRA_BYTES);
 
         byte[] initialHash = getInitialHash(object);
 
@@ -125,8 +127,8 @@ public abstract class AbstractCryptography implements Cryptography, InternalCont
 
     @Override
     public byte[] getProofOfWorkTarget(ObjectMessage object, long nonceTrialsPerByte, long extraBytes) {
-        if (nonceTrialsPerByte == 0) nonceTrialsPerByte = context.getNetworkNonceTrialsPerByte();
-        if (extraBytes == 0) extraBytes = context.getNetworkExtraBytes();
+        if (nonceTrialsPerByte == 0) nonceTrialsPerByte = NETWORK_NONCE_TRIALS_PER_BYTE;
+        if (extraBytes == 0) extraBytes = NETWORK_EXTRA_BYTES;
 
         BigInteger TTL = BigInteger.valueOf(object.getExpiresTime() - UnixTime.now());
         BigInteger numerator = TWO_POW_64;
diff --git a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
index a1991f8..530ece0 100644
--- a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
@@ -31,16 +31,13 @@ import org.hamcrest.Description;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.*;
 
 import static ch.dissem.bitmessage.entity.payload.ObjectType.*;
 import static ch.dissem.bitmessage.utils.MessageMatchers.object;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.*;
 
 /**
@@ -216,6 +213,38 @@ public class BitmessageContextTest {
         assertTrue(chan.isChan());
     }
 
+    @Test
+    public void ensureDeterministicAddressesAreCreated() {
+        final int expected_size = 8;
+        List<BitmessageAddress> addresses = ctx.createDeterministicAddresses("test", expected_size, 4, 1, false);
+        assertEquals(expected_size, addresses.size());
+        Set<String> expected = new HashSet<>(expected_size);
+        expected.add("BM-2cWFkyuXXFw6d393RGnin2RpSXj8wxtt6F");
+        expected.add("BM-2cX8TF9vuQZEWvT7UrEeq1HN9dgiSUPLEN");
+        expected.add("BM-2cUzX8f9CKUU7L8NeB8GExZvf54PrcXq1S");
+        expected.add("BM-2cU7MAoQd7KE8SPF7AKFPpoEZKjk86KRqE");
+        expected.add("BM-2cVm8ByVBacc2DVhdTNs6rmy5ZQK6DUsrt");
+        expected.add("BM-2cW2af1vB6kWon2WkygDHqGwfcpfAFm2Jk");
+        expected.add("BM-2cWdWD7UtUN4gWChgNX9pvyvNPjUZvU8BT");
+        expected.add("BM-2cXkYgYcUrv4fGxSHzyEScW955Cc8sDteo");
+        for (BitmessageAddress a : addresses) {
+            assertTrue(expected.contains(a.getAddress()));
+            expected.remove(a.getAddress());
+        }
+    }
+    @Test
+    public void ensureShortDeterministicAddressesAreCreated() {
+        final int expected_size = 1;
+        List<BitmessageAddress> addresses = ctx.createDeterministicAddresses("test", expected_size, 4, 1, true);
+        assertEquals(expected_size, addresses.size());
+        Set<String> expected = new HashSet<>(expected_size);
+        expected.add("BM-NBGyBAEp6VnBkFWKpzUSgxuTqVdWPi78");
+        for (BitmessageAddress a : addresses) {
+            assertTrue(expected.contains(a.getAddress()));
+            expected.remove(a.getAddress());
+        }
+    }
+
     @Test
     public void ensureChanIsCreated() {
         BitmessageAddress chan = ctx.createChan("test");
diff --git a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
index a6e6c53..976e464 100644
--- a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
@@ -40,8 +40,6 @@ import static ch.dissem.bitmessage.entity.Plaintext.Status.PUBKEY_REQUESTED;
 import static ch.dissem.bitmessage.entity.Plaintext.Type.BROADCAST;
 import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
 import static ch.dissem.bitmessage.utils.MessageMatchers.plaintext;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 
 /**
diff --git a/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java b/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
index e489e35..e66beb1 100644
--- a/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
@@ -34,10 +34,6 @@ import java.util.Arrays;
 import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
-import static org.mockito.Mockito.anyLong;
 import static org.mockito.Mockito.*;
 
 /**
diff --git a/core/src/test/java/ch/dissem/bitmessage/utils/EncodeTest.java b/core/src/test/java/ch/dissem/bitmessage/utils/EncodeTest.java
index aaba5bf..23d602c 100644
--- a/core/src/test/java/ch/dissem/bitmessage/utils/EncodeTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/utils/EncodeTest.java
@@ -57,7 +57,7 @@ public class EncodeTest {
         checkBytes(stream, 4, 3, 2, 1);
 
         stream = new ByteArrayOutputStream();
-        Encode.int32(3355443201l, stream);
+        Encode.int32(3355443201L, stream);
         checkBytes(stream, 200, 0, 0, 1);
     }
 
diff --git a/core/src/test/java/ch/dissem/bitmessage/utils/MessageMatchers.java b/core/src/test/java/ch/dissem/bitmessage/utils/MessageMatchers.java
index 8bb1e36..e423d02 100644
--- a/core/src/test/java/ch/dissem/bitmessage/utils/MessageMatchers.java
+++ b/core/src/test/java/ch/dissem/bitmessage/utils/MessageMatchers.java
@@ -21,7 +21,6 @@ import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.payload.ObjectType;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
-import org.hamcrest.Matcher;
 import org.mockito.Matchers;
 
 /**
diff --git a/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java b/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java
index 33c7524..0b5b142 100644
--- a/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java
+++ b/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java
@@ -36,7 +36,10 @@ import static ch.dissem.bitmessage.utils.Singleton.security;
  * @author Christian Basler
  */
 public class CryptoCustomMessage<T extends Streamable> extends CustomMessage {
+    private static final long serialVersionUID = 7395193565986284426L;
+
     public static final String COMMAND = "ENCRYPTED";
+
     private final Reader<T> dataReader;
     private CryptoBox container;
     private BitmessageAddress sender;
diff --git a/extensions/src/main/java/ch/dissem/bitmessage/extensions/pow/ProofOfWorkRequest.java b/extensions/src/main/java/ch/dissem/bitmessage/extensions/pow/ProofOfWorkRequest.java
index 0024aaa..d661c50 100644
--- a/extensions/src/main/java/ch/dissem/bitmessage/extensions/pow/ProofOfWorkRequest.java
+++ b/extensions/src/main/java/ch/dissem/bitmessage/extensions/pow/ProofOfWorkRequest.java
@@ -32,6 +32,8 @@ import static ch.dissem.bitmessage.utils.Decode.*;
  * @author Christian Basler
  */
 public class ProofOfWorkRequest implements Streamable {
+    private static final long serialVersionUID = 4729003751499662713L;
+
     private final BitmessageAddress sender;
     private final byte[] initialHash;
     private final Request request;
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
index 5781bc3..54c8acf 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
@@ -41,6 +41,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedDeque;
 import java.util.concurrent.ConcurrentMap;
 
+import static ch.dissem.bitmessage.InternalContext.NETWORK_EXTRA_BYTES;
+import static ch.dissem.bitmessage.InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE;
 import static ch.dissem.bitmessage.networking.Connection.Mode.CLIENT;
 import static ch.dissem.bitmessage.networking.Connection.Mode.SYNC;
 import static ch.dissem.bitmessage.networking.Connection.State.*;
@@ -247,7 +249,7 @@ class Connection {
         }
         try {
             listener.receive(objectMessage);
-            security().checkProofOfWork(objectMessage, ctx.getNetworkNonceTrialsPerByte(), ctx.getNetworkExtraBytes());
+            security().checkProofOfWork(objectMessage, NETWORK_NONCE_TRIALS_PER_BYTE, NETWORK_EXTRA_BYTES);
             ctx.getInventory().storeObject(objectMessage);
             // offer object to some random nodes so it gets distributed throughout the network:
             networkHandler.offer(objectMessage.getInventoryVector());
diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index 2e63e3a..accb4c5 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -27,7 +27,6 @@ import ch.dissem.bitmessage.utils.Property;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.mockito.Mockito;
 
 import java.net.InetAddress;
 import java.util.concurrent.Future;
diff --git a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcNodeRegistryTest.java b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcNodeRegistryTest.java
index 044c44c..f56d973 100644
--- a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcNodeRegistryTest.java
+++ b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcNodeRegistryTest.java
@@ -23,6 +23,7 @@ import org.junit.Before;
 import org.junit.Test;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import static ch.dissem.bitmessage.utils.UnixTime.now;
@@ -73,7 +74,7 @@ public class JdbcNodeRegistryTest extends TestBase {
         List<NetworkAddress> knownAddresses = registry.getKnownAddresses(1000, 1);
         assertEquals(5, knownAddresses.size());
 
-        registry.offerAddresses(Arrays.asList(
+        registry.offerAddresses(Collections.singletonList(
                 createAddress(1, 8445, 1, now())
         ));
 
diff --git a/wif/src/main/java/ch/dissem/bitmessage/wif/WifExporter.java b/wif/src/main/java/ch/dissem/bitmessage/wif/WifExporter.java
index 00f2790..ad6098e 100644
--- a/wif/src/main/java/ch/dissem/bitmessage/wif/WifExporter.java
+++ b/wif/src/main/java/ch/dissem/bitmessage/wif/WifExporter.java
@@ -60,6 +60,9 @@ public class WifExporter {
         section.add("label", identity.getAlias());
         section.add("enabled", true);
         section.add("decoy", false);
+        if (identity.isChan()) {
+            section.add("chan", identity.isChan());
+        }
         section.add("noncetrialsperbyte", identity.getPubkey().getNonceTrialsPerByte());
         section.add("payloadlengthextrabytes", identity.getPubkey().getExtraBytes());
         section.add("privsigningkey", exportSecret(identity.getPrivateKey().getPrivateSigningKey()));
diff --git a/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java b/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java
index 3a45b44..1bd6bcd 100644
--- a/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java
+++ b/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java
@@ -70,6 +70,9 @@ public class WifImporter {
                     section.get("payloadlengthextrabytes", long.class),
                     Pubkey.Feature.bitfield(features)
             );
+            if (section.containsKey("chan")) {
+                address.setChan(section.get("chan", boolean.class));
+            }
             address.setAlias(section.get("label"));
             identities.add(address);
         }
diff --git a/wif/src/test/java/ch/dissem/bitmessage/wif/WifExporterTest.java b/wif/src/test/java/ch/dissem/bitmessage/wif/WifExporterTest.java
index b930c0a..225f2f9 100644
--- a/wif/src/test/java/ch/dissem/bitmessage/wif/WifExporterTest.java
+++ b/wif/src/test/java/ch/dissem/bitmessage/wif/WifExporterTest.java
@@ -17,6 +17,7 @@
 package ch.dissem.bitmessage.wif;
 
 import ch.dissem.bitmessage.BitmessageContext;
+import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.ports.*;
 import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import org.junit.Before;
@@ -80,9 +81,27 @@ public class WifExporterTest {
                 "noncetrialsperbyte = 320" + System.lineSeparator() +
                 "payloadlengthextrabytes = 14000" + System.lineSeparator() +
                 "privsigningkey = 5KU2gbe9u4rKJ8PHYb1rvwMnZnAJj4gtV5GLwoYckeYzygWUzB9" + System.lineSeparator() +
-                "privencryptionkey = 5KHd4c6cavd8xv4kzo3PwnVaYuBgEfg7voPQ5V97aZKgpYBXGck" + System.lineSeparator() + System.lineSeparator();
+                "privencryptionkey = 5KHd4c6cavd8xv4kzo3PwnVaYuBgEfg7voPQ5V97aZKgpYBXGck" + System.lineSeparator() +
+                System.lineSeparator();
         importer = new WifImporter(ctx, expected);
         exporter.addIdentity(importer.getIdentities().get(0));
         assertEquals(expected, exporter.toString());
     }
+
+    @Test
+    public void ensureChanIsAdded() throws Exception {
+        String expected = "[BM-2cW67GEKkHGonXKZLCzouLLxnLym3azS8r]" + System.lineSeparator() +
+                "label = general" + System.lineSeparator() +
+                "enabled = true" + System.lineSeparator() +
+                "decoy = false" + System.lineSeparator() +
+                "chan = true" + System.lineSeparator() +
+                "noncetrialsperbyte = 1000" + System.lineSeparator() +
+                "payloadlengthextrabytes = 1000" + System.lineSeparator() +
+                "privsigningkey = 5Jnbdwc4u4DG9ipJxYLznXSvemkRFueQJNHujAQamtDDoX3N1eQ" + System.lineSeparator() +
+                "privencryptionkey = 5JrDcFtQDv5ydcHRW6dfGUEvThoxCCLNEUaxQfy8LXXgTJzVAcq" + System.lineSeparator() +
+                System.lineSeparator();
+        BitmessageAddress chan = ctx.joinChan("general", "BM-2cW67GEKkHGonXKZLCzouLLxnLym3azS8r");
+        exporter.addIdentity(chan);
+        assertEquals(expected, exporter.toString());
+    }
 }
\ No newline at end of file
diff --git a/wif/src/test/java/ch/dissem/bitmessage/wif/WifImporterTest.java b/wif/src/test/java/ch/dissem/bitmessage/wif/WifImporterTest.java
index fe8e15c..398ff20 100644
--- a/wif/src/test/java/ch/dissem/bitmessage/wif/WifImporterTest.java
+++ b/wif/src/test/java/ch/dissem/bitmessage/wif/WifImporterTest.java
@@ -25,9 +25,7 @@ import org.junit.Test;
 
 import java.util.List;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
 public class WifImporterTest {
@@ -69,6 +67,7 @@ public class WifImporterTest {
         assertNotNull("Private key", identity.getPrivateKey());
         assertEquals(32, identity.getPrivateKey().getPrivateEncryptionKey().length);
         assertEquals(32, identity.getPrivateKey().getPrivateSigningKey().length);
+        assertFalse(identity.isChan());
     }
 
     @Test
@@ -98,4 +97,20 @@ public class WifImporterTest {
         importer.importIdentity(identities.get(0));
         verify(repo, times(1)).save(identities.get(0));
     }
+
+    @Test
+    public void ensureChanIsImported() throws Exception {
+        importer = new WifImporter(ctx, "[BM-2cW67GEKkHGonXKZLCzouLLxnLym3azS8r]\n" +
+                "label = [chan] general\n" +
+                "enabled = true\n" +
+                "decoy = false\n" +
+                "chan = true\n" +
+                "noncetrialsperbyte = 1000\n" +
+                "payloadlengthextrabytes = 1000\n" +
+                "privsigningkey = 5Jnbdwc4u4DG9ipJxYLznXSvemkRFueQJNHujAQamtDDoX3N1eQ\n" +
+                "privencryptionkey = 5JrDcFtQDv5ydcHRW6dfGUEvThoxCCLNEUaxQfy8LXXgTJzVAcq\n");
+        assertEquals(1, importer.getIdentities().size());
+        BitmessageAddress chan = importer.getIdentities().get(0);
+        assertTrue(chan.isChan());
+    }
 }
\ No newline at end of file

From e8ddf90363b84d01c5091f54552011197c2a1ed8 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 11 Apr 2016 15:10:59 +0200
Subject: [PATCH 28/87] Provide a more flexible way to label messages. I'm not
 quite sure about chans yet

---
 build.gradle                                  |  2 +-
 .../dissem/bitmessage/BitmessageContext.java  | 26 ++++++-
 .../bitmessage/DefaultMessageListener.java    | 30 ++++----
 .../ch/dissem/bitmessage/InternalContext.java |  2 +-
 .../bitmessage/ports/DefaultLabeler.java      | 68 +++++++++++++++++++
 .../ch/dissem/bitmessage/ports/Labeler.java   | 39 +++++++++++
 .../bitmessage/BitmessageContextTest.java     |  4 +-
 .../DefaultMessageListenerTest.java           |  3 +-
 .../dissem/bitmessage/demo/Application.java   |  6 +-
 9 files changed, 158 insertions(+), 22 deletions(-)
 create mode 100644 core/src/main/java/ch/dissem/bitmessage/ports/DefaultLabeler.java
 create mode 100644 core/src/main/java/ch/dissem/bitmessage/ports/Labeler.java

diff --git a/build.gradle b/build.gradle
index 917a0d4..0e96284 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ subprojects {
 
     sourceCompatibility = 1.7
     group = 'ch.dissem.jabit'
-    version = '1.0.2-SNAPSHOT'
+    version = '1.1.0-SNAPSHOT'
 
     ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 51243ab..f33b26c 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -17,7 +17,10 @@
 package ch.dissem.bitmessage;
 
 import ch.dissem.bitmessage.entity.*;
-import ch.dissem.bitmessage.entity.payload.*;
+import ch.dissem.bitmessage.entity.payload.Broadcast;
+import ch.dissem.bitmessage.entity.payload.Msg;
+import ch.dissem.bitmessage.entity.payload.ObjectPayload;
+import ch.dissem.bitmessage.entity.payload.ObjectType;
 import ch.dissem.bitmessage.entity.payload.Pubkey.Feature;
 import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
@@ -65,6 +68,7 @@ public class BitmessageContext {
 
     private final InternalContext ctx;
 
+    private final Labeler labeler;
     private final Listener listener;
     private final NetworkHandler.MessageListener networkListener;
 
@@ -72,8 +76,9 @@ public class BitmessageContext {
 
     private BitmessageContext(Builder builder) {
         ctx = new InternalContext(builder);
+        labeler = builder.labeler;
         listener = builder.listener;
-        networkListener = new DefaultMessageListener(ctx, listener);
+        networkListener = new DefaultMessageListener(ctx, labeler, listener);
 
         // As this thread is used for parts that do POW, which itself uses parallel threads, only
         // one should be executed at any time.
@@ -97,6 +102,10 @@ public class BitmessageContext {
         return ctx.getMessageRepository();
     }
 
+    public Labeler labeler() {
+        return labeler;
+    }
+
     public BitmessageAddress createIdentity(boolean shorter, Feature... features) {
         final BitmessageAddress identity = new BitmessageAddress(new PrivateKey(
                 shorter,
@@ -280,7 +289,9 @@ public class BitmessageContext {
             try {
                 Broadcast broadcast = (Broadcast) object.getPayload();
                 broadcast.decrypt(address);
-                listener.receive(broadcast.getPlaintext());
+                // This decrypts it twice, but on the other hand it doesn't try to decrypt the objects with
+                // other subscriptions and the interface stays as simple as possible.
+                networkListener.receive(object);
             } catch (DecryptionFailedException ignore) {
             } catch (Exception e) {
                 LOG.debug(e.getMessage(), e);
@@ -318,6 +329,7 @@ public class BitmessageContext {
         Cryptography cryptography;
         MessageCallback messageCallback;
         CustomCommandHandler customCommandHandler;
+        Labeler labeler;
         Listener listener;
         int connectionLimit = 150;
         long connectionTTL = 30 * MINUTE;
@@ -378,6 +390,11 @@ public class BitmessageContext {
             return this;
         }
 
+        public Builder labeler(Labeler labeler) {
+            this.labeler = labeler;
+            return this;
+        }
+
         public Builder listener(Listener listener) {
             this.listener = listener;
             return this;
@@ -430,6 +447,9 @@ public class BitmessageContext {
             if (messageCallback == null) {
                 messageCallback = new BaseMessageCallback();
             }
+            if (labeler == null) {
+                labeler = new DefaultLabeler();
+            }
             if (customCommandHandler == null) {
                 customCommandHandler = new CustomCommandHandler() {
                     @Override
diff --git a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
index c2c2f64..74a6560 100644
--- a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
+++ b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
@@ -20,8 +20,9 @@ import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.payload.*;
-import ch.dissem.bitmessage.entity.valueobject.Label;
+import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
+import ch.dissem.bitmessage.ports.Labeler;
 import ch.dissem.bitmessage.ports.NetworkHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,10 +37,12 @@ import static ch.dissem.bitmessage.utils.UnixTime.DAY;
 class DefaultMessageListener implements NetworkHandler.MessageListener {
     private final static Logger LOG = LoggerFactory.getLogger(DefaultMessageListener.class);
     private final InternalContext ctx;
+    private final Labeler labeler;
     private final BitmessageContext.Listener listener;
 
-    public DefaultMessageListener(InternalContext context, BitmessageContext.Listener listener) {
+    public DefaultMessageListener(InternalContext context, Labeler labeler, BitmessageContext.Listener listener) {
         this.ctx = context;
+        this.labeler = labeler;
         this.listener = listener;
     }
 
@@ -127,12 +130,7 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
                 if (!object.isSignatureValid(msg.getPlaintext().getFrom().getPubkey())) {
                     LOG.warn("Msg with IV " + object.getInventoryVector() + " was successfully decrypted, but signature check failed. Ignoring.");
                 } else {
-                    msg.getPlaintext().setStatus(RECEIVED);
-                    msg.getPlaintext().addLabels(ctx.getMessageRepository().getLabels(Label.Type.INBOX, Label.Type.UNREAD));
-                    msg.getPlaintext().setInventoryVector(object.getInventoryVector());
-                    ctx.getMessageRepository().save(msg.getPlaintext());
-                    listener.receive(msg.getPlaintext());
-                    updatePubkey(msg.getPlaintext().getFrom(), msg.getPlaintext().getFrom().getPubkey());
+                    receive(object.getInventoryVector(), msg.getPlaintext());
                 }
                 break;
             } catch (DecryptionFailedException ignore) {
@@ -151,15 +149,19 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
                 if (!object.isSignatureValid(broadcast.getPlaintext().getFrom().getPubkey())) {
                     LOG.warn("Broadcast with IV " + object.getInventoryVector() + " was successfully decrypted, but signature check failed. Ignoring.");
                 } else {
-                    broadcast.getPlaintext().setStatus(RECEIVED);
-                    broadcast.getPlaintext().addLabels(ctx.getMessageRepository().getLabels(Label.Type.INBOX, Label.Type.BROADCAST, Label.Type.UNREAD));
-                    broadcast.getPlaintext().setInventoryVector(object.getInventoryVector());
-                    ctx.getMessageRepository().save(broadcast.getPlaintext());
-                    listener.receive(broadcast.getPlaintext());
-                    updatePubkey(broadcast.getPlaintext().getFrom(), broadcast.getPlaintext().getFrom().getPubkey());
+                    receive(object.getInventoryVector(), broadcast.getPlaintext());
                 }
             } catch (DecryptionFailedException ignore) {
             }
         }
     }
+
+    protected void receive(InventoryVector iv, Plaintext msg) {
+        msg.setStatus(RECEIVED);
+        msg.setInventoryVector(iv);
+        labeler.setLabels(msg);
+        ctx.getMessageRepository().save(msg);
+        listener.receive(msg);
+        updatePubkey(msg.getFrom(), msg.getFrom().getPubkey());
+    }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
index 00ec40e..56dd9e9 100644
--- a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
@@ -96,7 +96,7 @@ public class InternalContext {
 
         init(cryptography, inventory, nodeRegistry, networkHandler, addressRepository, messageRepository,
                 proofOfWorkRepository, proofOfWorkService, proofOfWorkEngine,
-                messageCallback, customCommandHandler);
+                messageCallback, customCommandHandler, builder.labeler);
         for (BitmessageAddress identity : addressRepository.getIdentities()) {
             streams.add(identity.getStream());
         }
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/DefaultLabeler.java b/core/src/main/java/ch/dissem/bitmessage/ports/DefaultLabeler.java
new file mode 100644
index 0000000..1598ce1
--- /dev/null
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/DefaultLabeler.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.ports;
+
+import ch.dissem.bitmessage.InternalContext;
+import ch.dissem.bitmessage.entity.Plaintext;
+import ch.dissem.bitmessage.entity.valueobject.Label;
+
+import java.util.Iterator;
+
+public class DefaultLabeler implements Labeler, InternalContext.ContextHolder {
+    private InternalContext ctx;
+
+    @Override
+    public void setLabels(Plaintext msg) {
+        if (msg.getType() == Plaintext.Type.BROADCAST) {
+            msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.INBOX, Label.Type.BROADCAST, Label.Type.UNREAD));
+        } else {
+            msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.INBOX, Label.Type.UNREAD));
+        }
+    }
+
+    @Override
+    public void markAsRead(Plaintext msg) {
+        Iterator<Label> iterator = msg.getLabels().iterator();
+        while (iterator.hasNext()) {
+            Label label = iterator.next();
+            if (label.getType() == Label.Type.UNREAD) {
+                iterator.remove();
+            }
+        }
+    }
+
+    @Override
+    public void markAsUnread(Plaintext msg) {
+        msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.UNREAD));
+    }
+
+    @Override
+    public void delete(Plaintext msg) {
+        msg.getLabels().clear();
+        msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.TRASH));
+    }
+
+    @Override
+    public void archive(Plaintext msg) {
+        msg.getLabels().clear();
+    }
+
+    @Override
+    public void setContext(InternalContext ctx) {
+        this.ctx = ctx;
+    }
+}
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/Labeler.java b/core/src/main/java/ch/dissem/bitmessage/ports/Labeler.java
new file mode 100644
index 0000000..95febaf
--- /dev/null
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/Labeler.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.ports;
+
+import ch.dissem.bitmessage.entity.Plaintext;
+
+/**
+ * Defines and sets labels
+ */
+public interface Labeler {
+    /**
+     * Sets the labels of a newly received message.
+     *
+     * @param msg an unlabeled message or broadcast
+     */
+    void setLabels(Plaintext msg);
+
+    void markAsRead(Plaintext msg);
+
+    void markAsUnread(Plaintext msg);
+
+    void delete(Plaintext msg);
+
+    void archive(Plaintext msg);
+}
diff --git a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
index 530ece0..7ca0d87 100644
--- a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
@@ -143,10 +143,11 @@ public class BitmessageContextTest {
         objects.add(TestUtils.loadObjectMessage(5, "V5Broadcast.payload"));
         when(ctx.internals().getInventory().getObjects(eq(address.getStream()), anyLong(), any(ObjectType.class)))
                 .thenReturn(objects);
+        when(ctx.addresses().getSubscriptions(anyLong())).thenReturn(Collections.singletonList(address));
 
         ctx.addSubscribtion(address);
 
-        verify(ctx.addresses(), times(1)).save(address);
+        verify(ctx.addresses(), atLeastOnce()).save(address);
         assertThat(address.isSubscribed(), is(true));
         verify(ctx.internals().getInventory()).getObjects(eq(address.getStream()), anyLong(), any(ObjectType.class));
         verify(listener).receive(any(Plaintext.class));
@@ -232,6 +233,7 @@ public class BitmessageContextTest {
             expected.remove(a.getAddress());
         }
     }
+
     @Test
     public void ensureShortDeterministicAddressesAreCreated() {
         final int expected_size = 1;
diff --git a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
index 976e464..710bf98 100644
--- a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
@@ -25,6 +25,7 @@ import ch.dissem.bitmessage.entity.payload.GetPubkey;
 import ch.dissem.bitmessage.entity.payload.Msg;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.AddressRepository;
+import ch.dissem.bitmessage.ports.Labeler;
 import ch.dissem.bitmessage.ports.MessageRepository;
 import ch.dissem.bitmessage.utils.Singleton;
 import ch.dissem.bitmessage.utils.TestBase;
@@ -62,7 +63,7 @@ public class DefaultMessageListenerTest extends TestBase {
         when(ctx.getAddressRepository()).thenReturn(addressRepo);
         when(ctx.getMessageRepository()).thenReturn(messageRepo);
 
-        listener = new DefaultMessageListener(ctx, mock(BitmessageContext.Listener.class));
+        listener = new DefaultMessageListener(ctx, mock(Labeler.class), mock(BitmessageContext.Listener.class));
     }
 
     @Test
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
index f480785..f3d9579 100644
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
@@ -21,6 +21,7 @@ import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
+import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.networking.DefaultNetworkHandler;
 import ch.dissem.bitmessage.ports.MemoryNodeRegistry;
 import ch.dissem.bitmessage.repository.*;
@@ -30,6 +31,7 @@ import org.slf4j.LoggerFactory;
 import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static ch.dissem.bitmessage.demo.CommandLine.COMMAND_BACK;
 import static ch.dissem.bitmessage.demo.CommandLine.ERROR_UNKNOWN_COMMAND;
@@ -325,8 +327,10 @@ public class Application {
         System.out.println();
         System.out.println(message.getText());
         System.out.println();
-        System.out.println("Labels: " + message.getLabels());
+        System.out.println(message.getLabels().stream().map(Label::toString).collect(
+                Collectors.joining("Labels: ", ", ", "")));
         System.out.println();
+        ctx.labeler().markAsRead(message);
         String command;
         do {
             System.out.println("r) reply");

From c31ec7a9e526a5e275952635055d95b8e58dbb32 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Tue, 12 Apr 2016 17:27:19 +0200
Subject: [PATCH 29/87] Fixed problems after merging

---
 .../dissem/bitmessage/DefaultMessageListener.java |  4 ++--
 .../ch/dissem/bitmessage/InternalContext.java     | 15 +++++----------
 .../ch/dissem/bitmessage/entity/Plaintext.java    |  2 +-
 .../ch/dissem/bitmessage/entity/payload/Ack.java  |  0
 .../bitmessage/DefaultMessageListenerTest.java    | 11 ++++++++---
 5 files changed, 16 insertions(+), 16 deletions(-)
 rename {domain => core}/src/main/java/ch/dissem/bitmessage/entity/payload/Ack.java (100%)

diff --git a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
index c8eed14..e8be606 100644
--- a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
+++ b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
@@ -165,8 +165,8 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
         listener.receive(msg);
         updatePubkey(msg.getFrom(), msg.getFrom().getPubkey());
 
-        if (msg.getType() == Type.MSG && identity.has(Pubkey.Feature.DOES_ACK)) {
-            ObjectMessage ack = plaintext.getAckMessage();
+        if (msg.getType() == Plaintext.Type.MSG && msg.getTo().has(Pubkey.Feature.DOES_ACK)) {
+            ObjectMessage ack = msg.getAckMessage();
             if (ack != null) {
                 ctx.getInventory().storeObject(ack);
                 ctx.getNetworkHandler().offer(ack.getInventoryVector());
diff --git a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
index 03c6bfc..586adf4 100644
--- a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
@@ -16,14 +16,10 @@
 
 package ch.dissem.bitmessage;
 
-import ch.dissem.bitmessage.entity.BitmessageAddress;
-import ch.dissem.bitmessage.entity.Encrypted;
-import ch.dissem.bitmessage.entity.ObjectMessage;
-import ch.dissem.bitmessage.entity.payload.*;
-import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.entity.*;
 import ch.dissem.bitmessage.entity.payload.*;
 import ch.dissem.bitmessage.entity.valueobject.Label;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.ports.*;
 import ch.dissem.bitmessage.utils.Singleton;
 import ch.dissem.bitmessage.utils.TTL;
@@ -36,7 +32,6 @@ import java.util.Arrays;
 import java.util.TreeSet;
 
 import static ch.dissem.bitmessage.entity.Plaintext.Status.SENT;
-import static ch.dissem.bitmessage.utils.UnixTime.DAY;
 
 /**
  * The internal context should normally only be used for port implementations. If you need it in your client
@@ -182,11 +177,11 @@ public class InternalContext {
             if (payload instanceof Msg && recipient.has(Pubkey.Feature.DOES_ACK)) {
                 ObjectMessage ackMessage = ((Msg) payload).getPlaintext().getAckMessage();
                 messageCallback.proofOfWorkStarted(payload);
-                security.doProofOfWork(ackMessage, networkNonceTrialsPerByte, networkExtraBytes, new ProofOfWorkEngine.Callback() {
+                cryptography.doProofOfWork(ackMessage, NETWORK_NONCE_TRIALS_PER_BYTE, NETWORK_EXTRA_BYTES, new ProofOfWorkEngine.Callback() {
                     @Override
-                    public void onNonceCalculated(byte[] nonce) {
+                    public void onNonceCalculated(byte[] initialHash, byte[] nonce) {
                         object.encrypt(recipient.getPubkey());
-                        proofOfWorkService.doProofOfWork(to, object);
+                        proofOfWorkService.doProofOfWork(recipient, object);
                     }
                 });
             } else {
@@ -318,7 +313,7 @@ public class InternalContext {
         }
 
         @Override
-        public void onNonceCalculated(byte[] nonce) {
+        public void onNonceCalculated(byte[] initialHash, byte[] nonce) {
             object.setNonce(nonce);
             messageCallback.proofOfWorkCompleted(payload);
             if (payload instanceof PlaintextHolder) {
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
index 01deca8..c7f23ce 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
@@ -175,7 +175,7 @@ public class Plaintext implements Streamable {
         if (type == Type.MSG) {
             if (to.has(Pubkey.Feature.DOES_ACK)) {
                 ByteArrayOutputStream ack = new ByteArrayOutputStream();
-                ackMessage.write(ack);
+                getAckMessage().write(ack);
                 byte[] data = ack.toByteArray();
                 Encode.varInt(data.length, out);
                 out.write(data);
diff --git a/domain/src/main/java/ch/dissem/bitmessage/entity/payload/Ack.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Ack.java
similarity index 100%
rename from domain/src/main/java/ch/dissem/bitmessage/entity/payload/Ack.java
rename to core/src/main/java/ch/dissem/bitmessage/entity/payload/Ack.java
diff --git a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
index 710bf98..e225924 100644
--- a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
@@ -24,9 +24,7 @@ import ch.dissem.bitmessage.entity.payload.Broadcast;
 import ch.dissem.bitmessage.entity.payload.GetPubkey;
 import ch.dissem.bitmessage.entity.payload.Msg;
 import ch.dissem.bitmessage.factory.Factory;
-import ch.dissem.bitmessage.ports.AddressRepository;
-import ch.dissem.bitmessage.ports.Labeler;
-import ch.dissem.bitmessage.ports.MessageRepository;
+import ch.dissem.bitmessage.ports.*;
 import ch.dissem.bitmessage.utils.Singleton;
 import ch.dissem.bitmessage.utils.TestBase;
 import ch.dissem.bitmessage.utils.TestUtils;
@@ -51,6 +49,10 @@ public class DefaultMessageListenerTest extends TestBase {
     private AddressRepository addressRepo;
     @Mock
     private MessageRepository messageRepo;
+    @Mock
+    private Inventory inventory;
+    @Mock
+    private NetworkHandler networkHandler;
 
     private InternalContext ctx;
     private DefaultMessageListener listener;
@@ -62,6 +64,8 @@ public class DefaultMessageListenerTest extends TestBase {
         Singleton.initialize(new BouncyCryptography());
         when(ctx.getAddressRepository()).thenReturn(addressRepo);
         when(ctx.getMessageRepository()).thenReturn(messageRepo);
+        when(ctx.getInventory()).thenReturn(inventory);
+        when(ctx.getNetworkHandler()).thenReturn(networkHandler);
 
         listener = new DefaultMessageListener(ctx, mock(Labeler.class), mock(BitmessageContext.Listener.class));
     }
@@ -104,6 +108,7 @@ public class DefaultMessageListenerTest extends TestBase {
     public void ensureIncomingMessageIsSaved() throws Exception {
         BitmessageAddress identity = TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8");
         BitmessageAddress contact = new BitmessageAddress(identity.getAddress());
+        contact.setPubkey(identity.getPubkey());
 
         when(addressRepo.getIdentities()).thenReturn(Collections.singletonList(identity));
 

From ddd5826f42c9253ca5a3fc6eba1d41f615e4eb77 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 13 Apr 2016 07:32:35 +0200
Subject: [PATCH 30/87] Fixed feature bitfield calculation/resolution

---
 .../bitmessage/entity/payload/Pubkey.java      | 11 +++++++----
 .../entity/BitmessageAddressTest.java          | 18 +++++++++++++-----
 .../repository/JdbcAddressRepositoryTest.java  |  5 ++++-
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
index 722f60c..789c64c 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
@@ -76,16 +76,19 @@ public abstract class Pubkey extends ObjectPayload {
          * Receiving node expects that the RIPE hash encoded in their address preceedes the encrypted message data of msg
          * messages bound for them.
          */
-        INCLUDE_DESTINATION(1 << 30),
+        INCLUDE_DESTINATION(30),
         /**
          * If true, the receiving node does send acknowledgements (rather than dropping them).
          */
-        DOES_ACK(1 << 31);
+        DOES_ACK(31);
 
         private int bit;
 
-        Feature(int bit) {
-            this.bit = bit;
+        Feature(int bitNumber) {
+            // The Bitmessage Protocol Specification starts counting at the most significant bit,
+            // thus the slightly awkward calculation.
+            // https://bitmessage.org/wiki/Protocol_specification#Pubkey_bitfield_features
+            this.bit = 1 << (31 - bitNumber);
         }
 
         public static int bitfield(Feature... features) {
diff --git a/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java b/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
index 9b22589..5d10cdf 100644
--- a/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
@@ -20,20 +20,25 @@ import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.payload.V4Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
-import ch.dissem.bitmessage.utils.Base58;
-import ch.dissem.bitmessage.utils.Bytes;
-import ch.dissem.bitmessage.utils.Strings;
-import ch.dissem.bitmessage.utils.TestUtils;
+import ch.dissem.bitmessage.utils.*;
 import org.junit.Test;
 
 import java.io.IOException;
 import java.util.Arrays;
 
 import static ch.dissem.bitmessage.entity.payload.Pubkey.Feature.DOES_ACK;
+import static ch.dissem.bitmessage.entity.payload.Pubkey.Feature.INCLUDE_DESTINATION;
 import static ch.dissem.bitmessage.utils.Singleton.security;
 import static org.junit.Assert.*;
 
-public class BitmessageAddressTest {
+public class BitmessageAddressTest extends TestBase {
+    @Test
+    public void ensureFeatureFlagIsCalculatedCorrectly() {
+        assertEquals(1, Pubkey.Feature.bitfield(DOES_ACK));
+        assertEquals(2, Pubkey.Feature.bitfield(INCLUDE_DESTINATION));
+        assertEquals(3, Pubkey.Feature.bitfield(DOES_ACK, INCLUDE_DESTINATION));
+    }
+
     @Test
     public void ensureBase58DecodesCorrectly() {
         assertHexEquals("800C28FCA386C7A227600B2FE50B7CAE11EC86D3BF1FBE471BE89827E19D72AA1D507A5B8D",
@@ -61,6 +66,7 @@ public class BitmessageAddressTest {
     public void ensureIdentityCanBeCreated() {
         BitmessageAddress address = new BitmessageAddress(new PrivateKey(false, 1, 1000, 1000, DOES_ACK));
         assertNotNull(address.getPubkey());
+        assertTrue(address.has(DOES_ACK));
     }
 
     @Test
@@ -90,6 +96,7 @@ public class BitmessageAddressTest {
         }
 
         assertArrayEquals(Bytes.fromHex("007402be6e76c3cb87caa946d0c003a3d4d8e1d5"), pubkey.getRipe());
+        assertTrue(address.has(DOES_ACK));
     }
 
     @Test
@@ -104,6 +111,7 @@ public class BitmessageAddressTest {
         } catch (Exception e) {
             fail(e.getMessage());
         }
+        assertTrue(address.has(DOES_ACK));
     }
 
     @Test
diff --git a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcAddressRepositoryTest.java b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcAddressRepositoryTest.java
index bd91329..1975d43 100644
--- a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcAddressRepositoryTest.java
+++ b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcAddressRepositoryTest.java
@@ -17,12 +17,14 @@
 package ch.dissem.bitmessage.repository;
 
 import ch.dissem.bitmessage.entity.BitmessageAddress;
+import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.List;
 
+import static ch.dissem.bitmessage.entity.payload.Pubkey.Feature.DOES_ACK;
 import static org.junit.Assert.*;
 
 public class JdbcAddressRepositoryTest extends TestBase {
@@ -46,7 +48,7 @@ public class JdbcAddressRepositoryTest extends TestBase {
         repo.save(new BitmessageAddress(CONTACT_B));
         repo.save(new BitmessageAddress(CONTACT_C));
 
-        BitmessageAddress identityA = new BitmessageAddress(new PrivateKey(false, 1, 1000, 1000));
+        BitmessageAddress identityA = new BitmessageAddress(new PrivateKey(false, 1, 1000, 1000, DOES_ACK));
         repo.save(identityA);
         IDENTITY_A = identityA.getAddress();
         BitmessageAddress identityB = new BitmessageAddress(new PrivateKey(false, 1, 1000, 1000));
@@ -68,6 +70,7 @@ public class JdbcAddressRepositoryTest extends TestBase {
         assertEquals(4, identity.getVersion());
         assertEquals(identity, repo.findIdentity(identity.getTag()));
         assertNull(repo.findContact(identity.getTag()));
+        assertTrue(identity.has(Pubkey.Feature.DOES_ACK));
     }
 
     @Test

From 61890b3da98c47fd6b0f4dbec16477cb6614a883 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 15 Apr 2016 17:18:11 +0200
Subject: [PATCH 31/87] Some improvements to the application

---
 .../dissem/bitmessage/demo/Application.java   | 67 +++++++++++++++++--
 1 file changed, 60 insertions(+), 7 deletions(-)

diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
index f3d9579..2c0246e 100644
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
@@ -99,7 +99,7 @@ public class Application {
                         subscriptions();
                         break;
                     case "m":
-                        messages();
+                        labels();
                         break;
                     case "?":
                         info();
@@ -280,22 +280,65 @@ public class Application {
         }
     }
 
-    private void messages() {
+    private void labels() {
+        List<Label> labels = ctx.messages().getLabels();
         String command;
         do {
-            List<Plaintext> messages = ctx.messages().findMessages(Plaintext.Status.RECEIVED);
+            System.out.println();
+            int i = 0;
+            for (Label label : labels) {
+                i++;
+                System.out.println(i + ") " + label + " [" + ctx.messages().countUnread(label) + "]");
+            }
+            System.out.println("a) Archive");
+            System.out.println();
+            System.out.println("c) compose message");
+            System.out.println("s) compose broadcast");
+            System.out.println(COMMAND_BACK);
+
+            command = commandLine.nextCommand();
+            switch (command) {
+                case "a":
+                    messages(null);
+                    break;
+                case "c":
+                    compose(false);
+                    break;
+                case "s":
+                    compose(true);
+                    break;
+                case "b":
+                    return;
+                default:
+                    try {
+                        int index = Integer.parseInt(command) - 1;
+                        messages(labels.get(index));
+                    } catch (NumberFormatException | IndexOutOfBoundsException e) {
+                        System.out.println(ERROR_UNKNOWN_COMMAND);
+                    }
+            }
+        } while (!"b".equalsIgnoreCase(command));
+    }
+
+    private void messages(Label label) {
+        String command;
+        do {
+            List<Plaintext> messages = ctx.messages().findMessages(label);
             System.out.println();
             int i = 0;
             for (Plaintext message : messages) {
                 i++;
-                System.out.println(i + ") From: " + message.getFrom() + "; Subject: " + message.getSubject());
+                System.out.println(i + (message.isUnread() ? ">" : ")") + " From: " + message.getFrom() + "; Subject: " + message.getSubject());
             }
             if (i == 0) {
-                System.out.println("You have no messages.");
+                System.out.println("There are no messages.");
             }
             System.out.println();
             System.out.println("c) compose message");
             System.out.println("s) compose broadcast");
+            if (label.getType() == Label.Type.TRASH) {
+                System.out.println("e) empty trash");
+            }
             System.out.println(COMMAND_BACK);
 
             command = commandLine.nextCommand();
@@ -306,6 +349,8 @@ public class Application {
                 case "s":
                     compose(true);
                     break;
+                case "e":
+                    messages.forEach(ctx.messages()::remove);
                 case "b":
                     return;
                 default:
@@ -328,13 +373,15 @@ public class Application {
         System.out.println(message.getText());
         System.out.println();
         System.out.println(message.getLabels().stream().map(Label::toString).collect(
-                Collectors.joining("Labels: ", ", ", "")));
+                Collectors.joining(", ", "Labels: ", "")));
         System.out.println();
         ctx.labeler().markAsRead(message);
+        ctx.messages().save(message);
         String command;
         do {
             System.out.println("r) reply");
             System.out.println("d) delete");
+            System.out.println("a) archive");
             System.out.println(COMMAND_BACK);
             command = commandLine.nextCommand();
             switch (command) {
@@ -342,7 +389,13 @@ public class Application {
                     compose(message.getTo(), message.getFrom(), "RE: " + message.getSubject());
                     break;
                 case "d":
-                    ctx.messages().remove(message);
+                    ctx.labeler().delete(message);
+                    ctx.messages().save(message);
+                    return;
+                case "a":
+                    ctx.labeler().archive(message);
+                    ctx.messages().save(message);
+                    return;
                 case "b":
                     return;
                 default:

From a0505f5704fb57d61c606e4cb483f31837dd56bc Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 25 Apr 2016 08:13:46 +0200
Subject: [PATCH 32/87] Minor improvements to the demo Application and a fix
 for when the ACK is empty

---
 .../dissem/bitmessage/entity/Plaintext.java   |  2 +-
 demo/build.gradle                             |  1 +
 .../dissem/bitmessage/demo/Application.java   | 20 +++++++++----------
 .../repository/JdbcMessageRepository.java     |  3 ++-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
index c7f23ce..b34206a 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
@@ -62,7 +62,7 @@ public class Plaintext implements Streamable {
         encoding = builder.encoding;
         message = builder.message;
         ackData = builder.ackData;
-        if (builder.ackMessage != null) {
+        if (builder.ackMessage != null && builder.ackMessage.length > 0) {
             ackMessage = Factory.getObjectMessage(
                     3,
                     new ByteArrayInputStream(builder.ackMessage),
diff --git a/demo/build.gradle b/demo/build.gradle
index d87b0f3..c1571ed 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -31,6 +31,7 @@ dependencies {
     compile 'org.slf4j:slf4j-simple:1.7.12'
     compile 'args4j:args4j:2.32'
     compile 'com.h2database:h2:1.4.190'
+    compile 'org.apache.commons:commons-lang3:3.4'
     testCompile 'junit:junit:4.11'
     testCompile 'org.mockito:mockito-core:1.10.19'
 }
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
index 2c0246e..89b91dc 100644
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
@@ -25,10 +25,10 @@ import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.networking.DefaultNetworkHandler;
 import ch.dissem.bitmessage.ports.MemoryNodeRegistry;
 import ch.dissem.bitmessage.repository.*;
+import org.apache.commons.lang3.text.WordUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.UnsupportedEncodingException;
 import java.net.InetAddress;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -56,13 +56,7 @@ public class Application {
                 .networkHandler(new DefaultNetworkHandler())
                 .cryptography(new BouncyCryptography())
                 .port(48444)
-                .listener(plaintext -> {
-                    try {
-                        System.out.println(new String(plaintext.getMessage(), "UTF-8"));
-                    } catch (UnsupportedEncodingException e) {
-                        LOG.error(e.getMessage(), e);
-                    }
-                })
+                .listener(plaintext -> System.out.println("New Message from " + plaintext.getFrom() + ": " + plaintext.getSubject()))
                 .build();
 
         if (syncServer == null) {
@@ -288,7 +282,13 @@ public class Application {
             int i = 0;
             for (Label label : labels) {
                 i++;
-                System.out.println(i + ") " + label + " [" + ctx.messages().countUnread(label) + "]");
+                System.out.print(i + ") " + label);
+                int unread = ctx.messages().countUnread(label);
+                if (unread > 0) {
+                    System.out.println(" [" + unread + "]");
+                } else {
+                    System.out.println();
+                }
             }
             System.out.println("a) Archive");
             System.out.println();
@@ -370,7 +370,7 @@ public class Application {
         System.out.println("To:      " + message.getTo());
         System.out.println("Subject: " + message.getSubject());
         System.out.println();
-        System.out.println(message.getText());
+        System.out.println(WordUtils.wrap(message.getText(), 120));
         System.out.println();
         System.out.println(message.getLabels().stream().map(Label::toString).collect(
                 Collectors.joining(", ", "Labels: ", "")));
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
index e043e7e..8f94d03 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
@@ -105,7 +105,8 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
         try (
                 Connection connection = config.getConnection();
                 Statement stmt = connection.createStatement();
-                ResultSet rs = stmt.executeQuery("SELECT count(*) FROM Message WHERE " + where)
+                ResultSet rs = stmt.executeQuery("SELECT count(*) FROM Message WHERE " + where
+                        + " ORDER BY received DESC")
         ) {
             if (rs.next()) {
                 return rs.getInt(1);

From 784b192bab8230656b4b569e810b835d1cc56fad Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Thu, 28 Apr 2016 07:15:48 +0200
Subject: [PATCH 33/87] Simplyfied MultiThreadedPOWEngine and thread pool
 creation

---
 .../dissem/bitmessage/BitmessageContext.java  |  78 +++++-------
 .../ports/MultiThreadedPOWEngine.java         | 116 ++++++++----------
 .../utils/ThreadFactoryBuilder.java           |  65 ++++++++++
 .../networking/DefaultNetworkHandler.java     |  23 ++--
 4 files changed, 155 insertions(+), 127 deletions(-)
 create mode 100644 core/src/main/java/ch/dissem/bitmessage/utils/ThreadFactoryBuilder.java

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index f33b26c..50033d1 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -37,7 +37,9 @@ import java.net.InetAddress;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
-import java.util.concurrent.*;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 
 import static ch.dissem.bitmessage.InternalContext.NETWORK_EXTRA_BYTES;
 import static ch.dissem.bitmessage.InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE;
@@ -64,12 +66,9 @@ public class BitmessageContext {
     public static final int CURRENT_VERSION = 3;
     private final static Logger LOG = LoggerFactory.getLogger(BitmessageContext.class);
 
-    private final ExecutorService pool;
-
     private final InternalContext ctx;
 
     private final Labeler labeler;
-    private final Listener listener;
     private final NetworkHandler.MessageListener networkListener;
 
     private final boolean sendPubkeyOnIdentityCreation;
@@ -77,12 +76,7 @@ public class BitmessageContext {
     private BitmessageContext(Builder builder) {
         ctx = new InternalContext(builder);
         labeler = builder.labeler;
-        listener = builder.listener;
-        networkListener = new DefaultMessageListener(ctx, labeler, listener);
-
-        // As this thread is used for parts that do POW, which itself uses parallel threads, only
-        // one should be executed at any time.
-        pool = Executors.newFixedThreadPool(1);
+        networkListener = new DefaultMessageListener(ctx, labeler, builder.listener);
 
         sendPubkeyOnIdentityCreation = builder.sendPubkeyOnIdentityCreation;
 
@@ -116,12 +110,7 @@ public class BitmessageContext {
         ));
         ctx.getAddressRepository().save(identity);
         if (sendPubkeyOnIdentityCreation) {
-            pool.submit(new Runnable() {
-                @Override
-                public void run() {
-                    ctx.sendPubkey(identity, identity.getStream());
-                }
-            });
+            ctx.sendPubkey(identity, identity.getStream());
         }
         return identity;
     }
@@ -177,37 +166,32 @@ public class BitmessageContext {
         if (msg.getFrom() == null || msg.getFrom().getPrivateKey() == null) {
             throw new IllegalArgumentException("'From' must be an identity, i.e. have a private key.");
         }
-        pool.submit(new Runnable() {
-            @Override
-            public void run() {
-                BitmessageAddress to = msg.getTo();
-                if (to != null) {
-                    if (to.getPubkey() == null) {
-                        LOG.info("Public key is missing from recipient. Requesting.");
-                        ctx.requestPubkey(to);
-                    }
-                    if (to.getPubkey() == null) {
-                        msg.setStatus(PUBKEY_REQUESTED);
-                        msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.OUTBOX));
-                        ctx.getMessageRepository().save(msg);
-                    }
-                }
-                if (to == null || to.getPubkey() != null) {
-                    LOG.info("Sending message.");
-                    msg.setStatus(DOING_PROOF_OF_WORK);
-                    ctx.getMessageRepository().save(msg);
-                    ctx.send(
-                            msg.getFrom(),
-                            to,
-                            wrapInObjectPayload(msg),
-                            TTL.msg()
-                    );
-                    msg.setStatus(SENT);
-                    msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.SENT));
-                    ctx.getMessageRepository().save(msg);
-                }
+        BitmessageAddress to = msg.getTo();
+        if (to != null) {
+            if (to.getPubkey() == null) {
+                LOG.info("Public key is missing from recipient. Requesting.");
+                ctx.requestPubkey(to);
             }
-        });
+            if (to.getPubkey() == null) {
+                msg.setStatus(PUBKEY_REQUESTED);
+                msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.OUTBOX));
+                ctx.getMessageRepository().save(msg);
+            }
+        }
+        if (to == null || to.getPubkey() != null) {
+            LOG.info("Sending message.");
+            msg.setStatus(DOING_PROOF_OF_WORK);
+            ctx.getMessageRepository().save(msg);
+            ctx.send(
+                    msg.getFrom(),
+                    to,
+                    wrapInObjectPayload(msg),
+                    TTL.msg()
+            );
+            msg.setStatus(SENT);
+            msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.SENT));
+            ctx.getMessageRepository().save(msg);
+        }
     }
 
     private ObjectPayload wrapInObjectPayload(Plaintext msg) {
@@ -427,6 +411,8 @@ public class BitmessageContext {
          * sender can't receive your public key) in some special situations. Also note that it's probably
          * not a good idea to set it too low.
          * </p>
+         *
+         * @deprecated use {@link TTL#pubkey(long)} instead.
          */
         public Builder pubkeyTTL(long days) {
             if (days < 0 || days > 28 * DAY) throw new IllegalArgumentException("TTL must be between 1 and 28 days");
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/MultiThreadedPOWEngine.java b/core/src/main/java/ch/dissem/bitmessage/ports/MultiThreadedPOWEngine.java
index 50164a3..fb45e50 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/MultiThreadedPOWEngine.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/MultiThreadedPOWEngine.java
@@ -25,16 +25,18 @@ import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.concurrent.Semaphore;
+import java.util.concurrent.*;
 
 import static ch.dissem.bitmessage.utils.Bytes.inc;
+import static ch.dissem.bitmessage.utils.ThreadFactoryBuilder.pool;
 
 /**
  * A POW engine using all available CPU cores.
  */
 public class MultiThreadedPOWEngine implements ProofOfWorkEngine {
     private static final Logger LOG = LoggerFactory.getLogger(MultiThreadedPOWEngine.class);
-    private static final Semaphore semaphore = new Semaphore(1, true);
+    private final ExecutorService waiterPool = Executors.newSingleThreadExecutor(pool("POW-waiter").daemon().build());
+    private final ExecutorService workerPool = Executors.newCachedThreadPool(pool("POW-worker").daemon().build());
 
     /**
      * This method will block until all pending nonce calculations are done, but not wait for its own calculation
@@ -46,42 +48,59 @@ public class MultiThreadedPOWEngine implements ProofOfWorkEngine {
      * @param callback    called with the calculated nonce as argument. The ProofOfWorkEngine implementation must make
      */
     @Override
-    public void calculateNonce(byte[] initialHash, byte[] target, Callback callback) {
-        try {
-            semaphore.acquire();
-        } catch (InterruptedException e) {
-            throw new ApplicationException(e);
-        }
-        callback = new CallbackWrapper(callback);
-        int cores = Runtime.getRuntime().availableProcessors();
-        if (cores > 255) cores = 255;
-        LOG.info("Doing POW using " + cores + " cores");
-        List<Worker> workers = new ArrayList<>(cores);
-        for (int i = 0; i < cores; i++) {
-            Worker w = new Worker(workers, (byte) cores, i, initialHash, target, callback);
-            workers.add(w);
-        }
-        for (Worker w : workers) {
-            // Doing this in the previous loop might cause a ConcurrentModificationException in the worker
-            // if a worker finds a nonce while new ones are still being added.
-            w.start();
-        }
+    public void calculateNonce(final byte[] initialHash, final byte[] target, final Callback callback) {
+        waiterPool.execute(new Runnable() {
+            @Override
+            public void run() {
+                long startTime = System.currentTimeMillis();
+
+                int cores = Runtime.getRuntime().availableProcessors();
+                if (cores > 255) cores = 255;
+                LOG.info("Doing POW using " + cores + " cores");
+                List<Worker> workers = new ArrayList<>(cores);
+                for (int i = 0; i < cores; i++) {
+                    Worker w = new Worker((byte) cores, i, initialHash, target);
+                    workers.add(w);
+                }
+                List<Future<byte[]>> futures = new ArrayList<>(cores);
+                for (Worker w : workers) {
+                    // Doing this in the previous loop might cause a ConcurrentModificationException in the worker
+                    // if a worker finds a nonce while new ones are still being added.
+                    futures.add(workerPool.submit(w));
+                }
+                try {
+                    while (!Thread.interrupted()) {
+                        for (Future<byte[]> future : futures) {
+                            if (future.isDone()) {
+                                callback.onNonceCalculated(initialHash, future.get());
+                                LOG.info("Nonce calculated in " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds");
+                                for (Future<byte[]> f : futures) {
+                                    f.cancel(true);
+                                }
+                                return;
+                            }
+                        }
+                        Thread.sleep(100);
+                    }
+                    LOG.error("POW waiter thread interrupted - this should not happen!");
+                } catch (ExecutionException e) {
+                    LOG.error(e.getMessage(), e);
+                } catch (InterruptedException e) {
+                    LOG.error("POW waiter thread interrupted - this should not happen!", e);
+                }
+            }
+        });
     }
 
-    private static class Worker extends Thread {
-        private final Callback callback;
+    private class Worker implements Callable<byte[]> {
         private final byte numberOfCores;
-        private final List<Worker> workers;
         private final byte[] initialHash;
         private final byte[] target;
         private final MessageDigest mda;
         private final byte[] nonce = new byte[8];
 
-        public Worker(List<Worker> workers, byte numberOfCores, int core, byte[] initialHash, byte[] target,
-                      Callback callback) {
-            this.callback = callback;
+        Worker(byte numberOfCores, int core, byte[] initialHash, byte[] target) {
             this.numberOfCores = numberOfCores;
-            this.workers = workers;
             this.initialHash = initialHash;
             this.target = target;
             this.nonce[7] = (byte) core;
@@ -94,49 +113,16 @@ public class MultiThreadedPOWEngine implements ProofOfWorkEngine {
         }
 
         @Override
-        public void run() {
+        public byte[] call() throws Exception {
             do {
                 inc(nonce, numberOfCores);
                 mda.update(nonce);
                 mda.update(initialHash);
                 if (!Bytes.lt(target, mda.digest(mda.digest()), 8)) {
-                    synchronized (callback) {
-                        if (!Thread.interrupted()) {
-                            for (Worker w : workers) {
-                                w.interrupt();
-                            }
-                            // Clear interrupted flag for callback
-                            Thread.interrupted();
-                            callback.onNonceCalculated(initialHash, nonce);
-                        }
-                    }
-                    return;
+                    return nonce;
                 }
             } while (!Thread.interrupted());
-        }
-    }
-
-    public static class CallbackWrapper implements Callback {
-        private final Callback callback;
-        private final long startTime;
-        private boolean waiting = true;
-
-        public CallbackWrapper(Callback callback) {
-            this.startTime = System.currentTimeMillis();
-            this.callback = callback;
-        }
-
-        @Override
-        public void onNonceCalculated(byte[] initialHash, byte[] nonce) {
-            // Prevents the callback from being called twice if two nonces are found simultaneously
-            synchronized (this) {
-                if (waiting) {
-                    semaphore.release();
-                    LOG.info("Nonce calculated in " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds");
-                    waiting = false;
-                    callback.onNonceCalculated(initialHash, nonce);
-                }
-            }
+            return null;
         }
     }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/utils/ThreadFactoryBuilder.java b/core/src/main/java/ch/dissem/bitmessage/utils/ThreadFactoryBuilder.java
new file mode 100644
index 0000000..36cf5b9
--- /dev/null
+++ b/core/src/main/java/ch/dissem/bitmessage/utils/ThreadFactoryBuilder.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.utils;
+
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class ThreadFactoryBuilder {
+    private final String namePrefix;
+    private int prio = Thread.NORM_PRIORITY;
+    private boolean daemon = false;
+
+    private ThreadFactoryBuilder(String pool) {
+        this.namePrefix = pool + "-thread-";
+    }
+
+
+    public static ThreadFactoryBuilder pool(String name) {
+        return new ThreadFactoryBuilder(name);
+    }
+
+    public ThreadFactoryBuilder lowPrio() {
+        prio = Thread.MIN_PRIORITY;
+        return this;
+    }
+
+    public ThreadFactoryBuilder daemon() {
+        daemon = true;
+        return this;
+    }
+
+    public ThreadFactory build() {
+        SecurityManager s = System.getSecurityManager();
+        final ThreadGroup group = (s != null) ? s.getThreadGroup() :
+                Thread.currentThread().getThreadGroup();
+
+        return new ThreadFactory() {
+            private final AtomicInteger threadNumber = new AtomicInteger(1);
+
+            @Override
+            public Thread newThread(Runnable r) {
+                Thread t = new Thread(group, r,
+                        namePrefix + threadNumber.getAndIncrement(),
+                        0);
+                t.setPriority(prio);
+                t.setDaemon(daemon);
+                return t;
+            }
+        };
+    }
+}
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
index 43333ac..289aa79 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
@@ -28,8 +28,7 @@ import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.NetworkHandler;
 import ch.dissem.bitmessage.utils.Collections;
 import ch.dissem.bitmessage.utils.Property;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import ch.dissem.bitmessage.utils.ThreadFactoryBuilder;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -40,35 +39,27 @@ import java.util.concurrent.*;
 import static ch.dissem.bitmessage.networking.Connection.Mode.SERVER;
 import static ch.dissem.bitmessage.networking.Connection.State.ACTIVE;
 import static ch.dissem.bitmessage.utils.DebugUtils.inc;
+import static ch.dissem.bitmessage.utils.ThreadFactoryBuilder.pool;
 import static java.util.Collections.newSetFromMap;
 
 /**
  * Handles all the networky stuff.
  */
 public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
-    private final static Logger LOG = LoggerFactory.getLogger(DefaultNetworkHandler.class);
-
     public final static int NETWORK_MAGIC_NUMBER = 8;
 
     final Collection<Connection> connections = new ConcurrentLinkedQueue<>();
-    private final ExecutorService pool;
+    private final ExecutorService pool = Executors.newCachedThreadPool(
+            pool("network")
+                    .lowPrio()
+                    .daemon()
+                    .build());
     private InternalContext ctx;
     private ServerRunnable server;
     private volatile boolean running;
 
     final Set<InventoryVector> requestedObjects = newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(50_000));
 
-    public DefaultNetworkHandler() {
-        pool = Executors.newCachedThreadPool(new ThreadFactory() {
-            @Override
-            public Thread newThread(Runnable r) {
-                Thread thread = Executors.defaultThreadFactory().newThread(r);
-                thread.setPriority(Thread.MIN_PRIORITY);
-                return thread;
-            }
-        });
-    }
-
     @Override
     public void setContext(InternalContext context) {
         this.ctx = context;

From ea2cd7bf5373c0a73de9ec06980fdc1ddeb60f91 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 29 Apr 2016 15:29:22 +0200
Subject: [PATCH 34/87] Improved labeler to cover all cases, and fixed when
 labels are set while sending (outbox vs sent) Removed message callback with
 both didn't work and is obsolete (use a labeler descendant)

---
 .../bitmessage/BaseMessageCallback.java       | 47 -----------------
 .../dissem/bitmessage/BitmessageContext.java  | 24 ++-------
 .../bitmessage/DefaultMessageListener.java    |  5 +-
 .../ch/dissem/bitmessage/InternalContext.java | 44 +++-------------
 .../ch/dissem/bitmessage/MessageCallback.java | 52 -------------------
 .../dissem/bitmessage/ProofOfWorkService.java |  1 +
 .../bitmessage/ports/DefaultLabeler.java      | 40 +++++++++++---
 .../ch/dissem/bitmessage/ports/Labeler.java   | 14 ++++-
 .../bitmessage/BitmessageContextTest.java     |  1 -
 9 files changed, 58 insertions(+), 170 deletions(-)
 delete mode 100644 core/src/main/java/ch/dissem/bitmessage/BaseMessageCallback.java
 delete mode 100644 core/src/main/java/ch/dissem/bitmessage/MessageCallback.java

diff --git a/core/src/main/java/ch/dissem/bitmessage/BaseMessageCallback.java b/core/src/main/java/ch/dissem/bitmessage/BaseMessageCallback.java
deleted file mode 100644
index bf46b74..0000000
--- a/core/src/main/java/ch/dissem/bitmessage/BaseMessageCallback.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2016 Christian Basler
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.dissem.bitmessage;
-
-import ch.dissem.bitmessage.entity.payload.ObjectPayload;
-import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
-
-/**
- * Default implementation that doesn't do anything.
- *
- * @author Christian Basler
- */
-public class BaseMessageCallback implements MessageCallback {
-    @Override
-    public void proofOfWorkStarted(ObjectPayload message) {
-        // No op
-    }
-
-    @Override
-    public void proofOfWorkCompleted(ObjectPayload message) {
-        // No op
-    }
-
-    @Override
-    public void messageOffered(ObjectPayload message, InventoryVector iv) {
-        // No op
-    }
-
-    @Override
-    public void messageAcknowledged(InventoryVector iv) {
-        // No op
-    }
-}
diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index c2fb84f..682aa80 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -22,7 +22,6 @@ import ch.dissem.bitmessage.entity.payload.Msg;
 import ch.dissem.bitmessage.entity.payload.ObjectPayload;
 import ch.dissem.bitmessage.entity.payload.ObjectType;
 import ch.dissem.bitmessage.entity.payload.Pubkey.Feature;
-import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
 import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
@@ -37,11 +36,12 @@ import java.net.InetAddress;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
-import java.util.concurrent.*;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 
 import static ch.dissem.bitmessage.InternalContext.NETWORK_EXTRA_BYTES;
 import static ch.dissem.bitmessage.InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE;
-import static ch.dissem.bitmessage.entity.Plaintext.Status.*;
 import static ch.dissem.bitmessage.entity.Plaintext.Type.BROADCAST;
 import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
 import static ch.dissem.bitmessage.utils.UnixTime.*;
@@ -155,8 +155,8 @@ public class BitmessageContext {
                 .from(from)
                 .to(to)
                 .message(subject, message)
-                .labels(messages().getLabels(Label.Type.SENT))
                 .build();
+        labeler().markAsSending(msg);
         send(msg);
     }
 
@@ -171,15 +171,11 @@ public class BitmessageContext {
                 ctx.requestPubkey(to);
             }
             if (to.getPubkey() == null) {
-                msg.setStatus(PUBKEY_REQUESTED);
-                msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.OUTBOX));
                 ctx.getMessageRepository().save(msg);
             }
         }
         if (to == null || to.getPubkey() != null) {
             LOG.info("Sending message.");
-            msg.setStatus(DOING_PROOF_OF_WORK);
-            msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.OUTBOX));
             ctx.getMessageRepository().save(msg);
             ctx.send(
                     msg.getFrom(),
@@ -187,9 +183,6 @@ public class BitmessageContext {
                     wrapInObjectPayload(msg),
                     TTL.msg()
             );
-            msg.setStatus(SENT);
-            msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.SENT));
-            ctx.getMessageRepository().save(msg);
         }
     }
 
@@ -310,7 +303,6 @@ public class BitmessageContext {
         ProofOfWorkRepository proofOfWorkRepository;
         ProofOfWorkEngine proofOfWorkEngine;
         Cryptography cryptography;
-        MessageCallback messageCallback;
         CustomCommandHandler customCommandHandler;
         Labeler labeler;
         Listener listener;
@@ -358,11 +350,6 @@ public class BitmessageContext {
             return this;
         }
 
-        public Builder messageCallback(MessageCallback callback) {
-            this.messageCallback = callback;
-            return this;
-        }
-
         public Builder customCommandHandler(CustomCommandHandler handler) {
             this.customCommandHandler = handler;
             return this;
@@ -429,9 +416,6 @@ public class BitmessageContext {
             if (proofOfWorkEngine == null) {
                 proofOfWorkEngine = new MultiThreadedPOWEngine();
             }
-            if (messageCallback == null) {
-                messageCallback = new BaseMessageCallback();
-            }
             if (labeler == null) {
                 labeler = new DefaultLabeler();
             }
diff --git a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
index e8be606..ce7ab8d 100644
--- a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
+++ b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
@@ -109,7 +109,7 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
         List<Plaintext> messages = ctx.getMessageRepository().findMessages(PUBKEY_REQUESTED, address);
         LOG.info("Sending " + messages.size() + " messages for contact " + address);
         for (Plaintext msg : messages) {
-            msg.setStatus(DOING_PROOF_OF_WORK);
+            ctx.getLabeler().markAsSending(msg);
             ctx.getMessageRepository().save(msg);
             ctx.send(
                     msg.getFrom(),
@@ -117,8 +117,6 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
                     new Msg(msg),
                     +2 * DAY
             );
-            msg.setStatus(SENT);
-            ctx.getMessageRepository().save(msg);
         }
     }
 
@@ -158,7 +156,6 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
     }
 
     protected void receive(InventoryVector iv, Plaintext msg) {
-        msg.setStatus(RECEIVED);
         msg.setInventoryVector(iv);
         labeler.setLabels(msg);
         ctx.getMessageRepository().save(msg);
diff --git a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
index 586adf4..15d6958 100644
--- a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
@@ -18,7 +18,6 @@ package ch.dissem.bitmessage;
 
 import ch.dissem.bitmessage.entity.*;
 import ch.dissem.bitmessage.entity.payload.*;
-import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.ports.*;
 import ch.dissem.bitmessage.utils.Singleton;
@@ -31,8 +30,6 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.TreeSet;
 
-import static ch.dissem.bitmessage.entity.Plaintext.Status.SENT;
-
 /**
  * The internal context should normally only be used for port implementations. If you need it in your client
  * implementation, you're either doing something wrong, something very weird, or the BitmessageContext should
@@ -55,9 +52,9 @@ public class InternalContext {
     private final MessageRepository messageRepository;
     private final ProofOfWorkRepository proofOfWorkRepository;
     private final ProofOfWorkEngine proofOfWorkEngine;
-    private final MessageCallback messageCallback;
     private final CustomCommandHandler customCommandHandler;
     private final ProofOfWorkService proofOfWorkService;
+    private final Labeler labeler;
 
     private final TreeSet<Long> streams = new TreeSet<>();
     private final int port;
@@ -76,11 +73,11 @@ public class InternalContext {
         this.proofOfWorkService = new ProofOfWorkService();
         this.proofOfWorkEngine = builder.proofOfWorkEngine;
         this.clientNonce = cryptography.randomNonce();
-        this.messageCallback = builder.messageCallback;
         this.customCommandHandler = builder.customCommandHandler;
         this.port = builder.port;
         this.connectionLimit = builder.connectionLimit;
         this.connectionTTL = builder.connectionTTL;
+        this.labeler = builder.labeler;
 
         Singleton.initialize(cryptography);
 
@@ -96,8 +93,7 @@ public class InternalContext {
         }
 
         init(cryptography, inventory, nodeRegistry, networkHandler, addressRepository, messageRepository,
-                proofOfWorkRepository, proofOfWorkService, proofOfWorkEngine,
-                messageCallback, customCommandHandler, builder.labeler);
+                proofOfWorkRepository, proofOfWorkService, proofOfWorkEngine, customCommandHandler, builder.labeler);
         for (BitmessageAddress identity : addressRepository.getIdentities()) {
             streams.add(identity.getStream());
         }
@@ -147,6 +143,10 @@ public class InternalContext {
         return proofOfWorkService;
     }
 
+    public Labeler getLabeler() {
+        return labeler;
+    }
+
     public long[] getStreams() {
         long[] result = new long[streams.size()];
         int i = 0;
@@ -176,7 +176,6 @@ public class InternalContext {
             }
             if (payload instanceof Msg && recipient.has(Pubkey.Feature.DOES_ACK)) {
                 ObjectMessage ackMessage = ((Msg) payload).getPlaintext().getAckMessage();
-                messageCallback.proofOfWorkStarted(payload);
                 cryptography.doProofOfWork(ackMessage, NETWORK_NONCE_TRIALS_PER_BYTE, NETWORK_EXTRA_BYTES, new ProofOfWorkEngine.Callback() {
                     @Override
                     public void onNonceCalculated(byte[] initialHash, byte[] nonce) {
@@ -208,7 +207,6 @@ public class InternalContext {
                     .build();
             response.sign(identity.getPrivateKey());
             response.encrypt(cryptography.createPublicKey(identity.getPublicDecryptionKey()));
-            messageCallback.proofOfWorkStarted(identity.getPubkey());
             // TODO: remember that the pubkey is just about to be sent, and on which stream!
             proofOfWorkService.doProofOfWork(response);
         } catch (IOException e) {
@@ -245,7 +243,6 @@ public class InternalContext {
                 .expiresTime(expires)
                 .payload(new GetPubkey(contact))
                 .build();
-        messageCallback.proofOfWorkStarted(request.getPayload());
         proofOfWorkService.doProofOfWork(request);
     }
 
@@ -302,31 +299,4 @@ public class InternalContext {
     public interface ContextHolder {
         void setContext(InternalContext context);
     }
-
-    private class ProofOfWorkCallback implements ProofOfWorkEngine.Callback {
-        private final ObjectMessage object;
-        private final ObjectPayload payload;
-
-        private ProofOfWorkCallback(ObjectMessage object, ObjectPayload payload) {
-            this.object = object;
-            this.payload = payload;
-        }
-
-        @Override
-        public void onNonceCalculated(byte[] initialHash, byte[] nonce) {
-            object.setNonce(nonce);
-            messageCallback.proofOfWorkCompleted(payload);
-            if (payload instanceof PlaintextHolder) {
-                Plaintext plaintext = ((PlaintextHolder) payload).getPlaintext();
-                plaintext.setInventoryVector(object.getInventoryVector());
-                plaintext.setStatus(SENT);
-                plaintext.removeLabel(Label.Type.OUTBOX);
-                plaintext.addLabels(messageRepository.getLabels(Label.Type.SENT));
-                messageRepository.save(plaintext);
-            }
-            inventory.storeObject(object);
-            networkHandler.offer(object.getInventoryVector());
-            messageCallback.messageOffered(payload, object.getInventoryVector());
-        }
-    }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/MessageCallback.java b/core/src/main/java/ch/dissem/bitmessage/MessageCallback.java
deleted file mode 100644
index d09ff97..0000000
--- a/core/src/main/java/ch/dissem/bitmessage/MessageCallback.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2015 Christian Basler
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.dissem.bitmessage;
-
-import ch.dissem.bitmessage.entity.payload.ObjectPayload;
-import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
-
-/**
- * Callback for message sending events, mostly so the user can be notified when POW is done.
- */
-public interface MessageCallback {
-    /**
-     * Called before calculation of proof of work begins.
-     */
-    void proofOfWorkStarted(ObjectPayload message);
-
-    /**
-     * Called after calculation of proof of work finished.
-     */
-    void proofOfWorkCompleted(ObjectPayload message);
-
-    /**
-     * Called once the message is offered to the network. Please note that this doesn't mean the message was sent,
-     * if the client is not connected to the network it's just stored in the inventory.
-     * <p>
-     * Also, please note that this is where the original payload as well as the {@link InventoryVector} of the sent
-     * message is available. If the callback needs the IV for some reason, it should be retrieved here. (Plaintext
-     * and Broadcast messages will have their IV property set automatically though.)
-     * </p>
-     */
-    void messageOffered(ObjectPayload message, InventoryVector iv);
-
-    /**
-     * This isn't called yet, as ACK messages aren't being processed yet. Also, this is only relevant for Plaintext
-     * messages.
-     */
-    void messageAcknowledged(InventoryVector iv);
-}
diff --git a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
index 93e461f..98fc9a1 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
@@ -66,6 +66,7 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
         Plaintext plaintext = messageRepo.getMessage(initialHash);
         if (plaintext != null) {
             plaintext.setInventoryVector(object.getInventoryVector());
+            ctx.getLabeler().markAsSent(plaintext);
             messageRepo.save(plaintext);
         }
         ctx.getInventory().storeObject(object);
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/DefaultLabeler.java b/core/src/main/java/ch/dissem/bitmessage/ports/DefaultLabeler.java
index 1598ce1..4f21b3e 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/DefaultLabeler.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/DefaultLabeler.java
@@ -20,13 +20,14 @@ import ch.dissem.bitmessage.InternalContext;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.valueobject.Label;
 
-import java.util.Iterator;
+import static ch.dissem.bitmessage.entity.Plaintext.Status.*;
 
 public class DefaultLabeler implements Labeler, InternalContext.ContextHolder {
     private InternalContext ctx;
 
     @Override
     public void setLabels(Plaintext msg) {
+        msg.setStatus(RECEIVED);
         if (msg.getType() == Plaintext.Type.BROADCAST) {
             msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.INBOX, Label.Type.BROADCAST, Label.Type.UNREAD));
         } else {
@@ -35,14 +36,37 @@ public class DefaultLabeler implements Labeler, InternalContext.ContextHolder {
     }
 
     @Override
-    public void markAsRead(Plaintext msg) {
-        Iterator<Label> iterator = msg.getLabels().iterator();
-        while (iterator.hasNext()) {
-            Label label = iterator.next();
-            if (label.getType() == Label.Type.UNREAD) {
-                iterator.remove();
-            }
+    public void markAsDraft(Plaintext msg) {
+        msg.setStatus(DRAFT);
+        msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.DRAFT));
+    }
+
+    @Override
+    public void markAsSending(Plaintext msg) {
+        if (msg.getTo() != null || msg.getTo().getPubkey() == null) {
+            msg.setStatus(PUBKEY_REQUESTED);
+        } else {
+            msg.setStatus(DOING_PROOF_OF_WORK);
         }
+        msg.removeLabel(Label.Type.DRAFT);
+        msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.OUTBOX));
+    }
+
+    @Override
+    public void markAsSent(Plaintext msg) {
+        msg.setStatus(SENT);
+        msg.removeLabel(Label.Type.OUTBOX);
+        msg.addLabels(ctx.getMessageRepository().getLabels(Label.Type.SENT));
+    }
+
+    @Override
+    public void markAsAcknowledged(Plaintext msg) {
+        msg.setStatus(SENT_ACKNOWLEDGED);
+    }
+
+    @Override
+    public void markAsRead(Plaintext msg) {
+        msg.removeLabel(Label.Type.UNREAD);
     }
 
     @Override
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/Labeler.java b/core/src/main/java/ch/dissem/bitmessage/ports/Labeler.java
index 95febaf..5e52845 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/Labeler.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/Labeler.java
@@ -19,7 +19,11 @@ package ch.dissem.bitmessage.ports;
 import ch.dissem.bitmessage.entity.Plaintext;
 
 /**
- * Defines and sets labels
+ * Defines and sets labels. Note that it should also update the status field of a message.
+ * <p>
+ * As the labeler gets called whenever the state of a message changes, it can also be used
+ * as a listener.
+ * </p>
  */
 public interface Labeler {
     /**
@@ -29,6 +33,14 @@ public interface Labeler {
      */
     void setLabels(Plaintext msg);
 
+    void markAsDraft(Plaintext msg);
+
+    void markAsSending(Plaintext msg);
+
+    void markAsSent(Plaintext msg);
+
+    void markAsAcknowledged(Plaintext msg);
+
     void markAsRead(Plaintext msg);
 
     void markAsUnread(Plaintext msg);
diff --git a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
index 7ca0d87..ed095a8 100644
--- a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
@@ -56,7 +56,6 @@ public class BitmessageContextTest {
                 .cryptography(new BouncyCryptography())
                 .inventory(mock(Inventory.class))
                 .listener(listener)
-                .messageCallback(mock(MessageCallback.class))
                 .messageRepo(mock(MessageRepository.class))
                 .networkHandler(mock(NetworkHandler.class))
                 .nodeRegistry(mock(NodeRegistry.class))

From c7594795f00ae23d9be89bf981e7c4429e35b7f6 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 2 May 2016 11:11:29 +0200
Subject: [PATCH 35/87] Fixed tests & bugs, removed Ack payload type (a
 GenericPayload is now used) - SystemTest don't work yet, sending messages
 seems broken - ProofOfWorkService needs some work, the current solution is a
 hack (and might be the reason above tests are broken)

---
 .../dissem/bitmessage/BitmessageContext.java  |  1 +
 .../ch/dissem/bitmessage/InternalContext.java |  5 +-
 .../bitmessage/entity/ObjectMessage.java      | 29 +++++++++++-
 .../dissem/bitmessage/entity/Plaintext.java   |  4 +-
 .../dissem/bitmessage/entity/payload/Ack.java | 33 -------------
 .../bitmessage/entity/payload/Broadcast.java  | 15 ++++++
 .../entity/payload/GenericPayload.java        |  2 +-
 .../dissem/bitmessage/entity/payload/Msg.java | 16 +++++++
 .../entity/payload/ObjectPayload.java         |  1 +
 .../ch/dissem/bitmessage/factory/Factory.java | 11 +++--
 .../bitmessage/BitmessageContextTest.java     | 46 +++++++++++++++++--
 .../DefaultMessageListenerTest.java           |  1 +
 .../ch/dissem/bitmessage/EncryptionTest.java  |  2 +-
 .../bitmessage/ProofOfWorkServiceTest.java    |  1 +
 .../bitmessage/entity/SerializationTest.java  |  2 +-
 .../ch/dissem/bitmessage/utils/TestUtils.java |  2 +-
 .../bitmessage/security/CryptographyTest.java |  8 ++--
 .../extensions/CryptoCustomMessageTest.java   |  2 +-
 18 files changed, 124 insertions(+), 57 deletions(-)
 delete mode 100644 core/src/main/java/ch/dissem/bitmessage/entity/payload/Ack.java

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 682aa80..b19c303 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -164,6 +164,7 @@ public class BitmessageContext {
         if (msg.getFrom() == null || msg.getFrom().getPrivateKey() == null) {
             throw new IllegalArgumentException("'From' must be an identity, i.e. have a private key.");
         }
+        msg.setStatus(Plaintext.Status.DRAFT);
         BitmessageAddress to = msg.getTo();
         if (to != null) {
             if (to.getPubkey() == null) {
diff --git a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
index 15d6958..58333d5 100644
--- a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
@@ -175,10 +175,13 @@ public class InternalContext {
                 object.sign(from.getPrivateKey());
             }
             if (payload instanceof Msg && recipient.has(Pubkey.Feature.DOES_ACK)) {
-                ObjectMessage ackMessage = ((Msg) payload).getPlaintext().getAckMessage();
+                final ObjectMessage ackMessage = ((Msg) payload).getPlaintext().getAckMessage();
                 cryptography.doProofOfWork(ackMessage, NETWORK_NONCE_TRIALS_PER_BYTE, NETWORK_EXTRA_BYTES, new ProofOfWorkEngine.Callback() {
                     @Override
                     public void onNonceCalculated(byte[] initialHash, byte[] nonce) {
+                        // FIXME: the message gets lost if calculation is cancelled
+                        // (e.g. by terminating the application)
+                        ackMessage.setNonce(nonce);
                         object.encrypt(recipient.getPubkey());
                         proofOfWorkService.doProofOfWork(recipient, object);
                     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
index 68aa5ac..a0878c2 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
@@ -29,6 +29,8 @@ import ch.dissem.bitmessage.utils.Encode;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.Objects;
 
 import static ch.dissem.bitmessage.utils.Singleton.security;
 
@@ -55,7 +57,7 @@ public class ObjectMessage implements MessagePayload {
         expiresTime = builder.expiresTime;
         objectType = builder.objectType;
         version = builder.payload.getVersion();
-        stream = builder.streamNumber;
+        stream = builder.streamNumber > 0 ? builder.streamNumber : builder.payload.getStream();
         payload = builder.payload;
     }
 
@@ -230,4 +232,29 @@ public class ObjectMessage implements MessagePayload {
             return new ObjectMessage(this);
         }
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        ObjectMessage that = (ObjectMessage) o;
+
+        return expiresTime == that.expiresTime &&
+                objectType == that.objectType &&
+                version == that.version &&
+                stream == that.stream &&
+                Objects.equals(payload, that.payload);
+    }
+
+    @Override
+    public int hashCode() {
+        int result = Arrays.hashCode(nonce);
+        result = 31 * result + (int) (expiresTime ^ (expiresTime >>> 32));
+        result = 31 * result + (int) (objectType ^ (objectType >>> 32));
+        result = 31 * result + (int) (version ^ (version >>> 32));
+        result = 31 * result + (int) (stream ^ (stream >>> 32));
+        result = 31 * result + (payload != null ? payload.hashCode() : 0);
+        return result;
+    }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
index b34206a..c0a33ef 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
@@ -173,7 +173,7 @@ public class Plaintext implements Streamable {
         Encode.varInt(message.length, out);
         out.write(message);
         if (type == Type.MSG) {
-            if (to.has(Pubkey.Feature.DOES_ACK)) {
+            if (to.has(Pubkey.Feature.DOES_ACK) && getAckMessage() != null) {
                 ByteArrayOutputStream ack = new ByteArrayOutputStream();
                 getAckMessage().write(ack);
                 byte[] data = ack.toByteArray();
@@ -255,7 +255,7 @@ public class Plaintext implements Streamable {
         return Objects.equals(encoding, plaintext.encoding) &&
                 Objects.equals(from, plaintext.from) &&
                 Arrays.equals(message, plaintext.message) &&
-                Arrays.equals(ackData, plaintext.ackData) &&
+                Objects.equals(getAckMessage(), plaintext.getAckMessage()) &&
                 Arrays.equals(to.getRipe(), plaintext.to.getRipe()) &&
                 Arrays.equals(signature, plaintext.signature) &&
                 Objects.equals(status, plaintext.status) &&
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Ack.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Ack.java
deleted file mode 100644
index a8308b9..0000000
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Ack.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package ch.dissem.bitmessage.entity.payload;
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-/**
- * Created by chrigu on 06.11.15.
- */
-public class Ack extends ObjectPayload {
-    private final long stream;
-    private final byte[] data;
-
-    public Ack(long version, long stream, byte[] data) {
-        super(version);
-        this.stream = stream;
-        this.data = data;
-    }
-
-    @Override
-    public ObjectType getType() {
-        return ObjectType.MSG;
-    }
-
-    @Override
-    public long getStream() {
-        return stream;
-    }
-
-    @Override
-    public void write(OutputStream out) throws IOException {
-        out.write(data);
-    }
-}
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java
index 7e19e8f..1533a2d 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java
@@ -23,6 +23,7 @@ import ch.dissem.bitmessage.entity.PlaintextHolder;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
 
 import java.io.IOException;
+import java.util.Objects;
 
 import static ch.dissem.bitmessage.entity.Plaintext.Type.BROADCAST;
 import static ch.dissem.bitmessage.utils.Singleton.security;
@@ -96,4 +97,18 @@ public abstract class Broadcast extends ObjectPayload implements Encrypted, Plai
     public boolean isDecrypted() {
         return plaintext != null;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        Broadcast broadcast = (Broadcast) o;
+        return stream == broadcast.stream &&
+                (Objects.equals(encrypted, broadcast.encrypted) || Objects.equals(plaintext, broadcast.plaintext));
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(stream);
+    }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
index 66cc296..4ae4696 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
@@ -39,7 +39,7 @@ public class GenericPayload extends ObjectPayload {
         this.data = data;
     }
 
-    public static GenericPayload read(long version, InputStream is, long stream, int length) throws IOException {
+    public static GenericPayload read(long version, long stream, InputStream is, int length) throws IOException {
         return new GenericPayload(version, stream, Decode.bytes(is, length));
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
index 8974ce3..edc4643 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
@@ -24,6 +24,7 @@ import ch.dissem.bitmessage.exception.DecryptionFailedException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.Objects;
 
 import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
 
@@ -108,4 +109,19 @@ public class Msg extends ObjectPayload implements Encrypted, PlaintextHolder {
         if (encrypted == null) throw new IllegalStateException("Msg must be signed and encrypted before writing it.");
         encrypted.write(out);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        Msg msg = (Msg) o;
+        return stream == msg.stream &&
+                (Objects.equals(encrypted, msg.encrypted) || Objects.equals(plaintext, msg.plaintext));
+    }
+
+    @Override
+    public int hashCode() {
+        return (int) stream;
+    }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java
index 33da28d..a7dbaff 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java
@@ -18,6 +18,7 @@ package ch.dissem.bitmessage.entity.payload;
 
 import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.Streamable;
+import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
index 48cafff..cfa3229 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
@@ -31,6 +31,7 @@ import java.io.InputStream;
 import java.net.SocketException;
 import java.net.SocketTimeoutException;
 
+import static ch.dissem.bitmessage.entity.payload.ObjectType.MSG;
 import static ch.dissem.bitmessage.utils.Singleton.security;
 
 /**
@@ -155,7 +156,7 @@ public class Factory {
         }
         // fallback: just store the message - we don't really care what it is
         LOG.trace("Unexpected object type: " + objectType);
-        return GenericPayload.read(version, stream, streamNumber, length);
+        return GenericPayload.read(version, streamNumber, stream, length);
     }
 
     private static ObjectPayload parseGetPubkey(long version, long streamNumber, InputStream stream, int length) throws IOException {
@@ -177,7 +178,7 @@ public class Factory {
 
     private static ObjectPayload parsePubkey(long version, long streamNumber, InputStream stream, int length) throws IOException {
         Pubkey pubkey = readPubkey(version, streamNumber, stream, length, true);
-        return pubkey != null ? pubkey : GenericPayload.read(version, stream, streamNumber, length);
+        return pubkey != null ? pubkey : GenericPayload.read(version, streamNumber, stream, length);
     }
 
     private static ObjectPayload parseMsg(long version, long streamNumber, InputStream stream, int length) throws IOException {
@@ -192,7 +193,7 @@ public class Factory {
                 return V5Broadcast.read(stream, streamNumber, length);
             default:
                 LOG.debug("Encountered unknown broadcast version " + version);
-                return GenericPayload.read(version, stream, streamNumber, length);
+                return GenericPayload.read(version, streamNumber, stream, length);
         }
     }
 
@@ -208,7 +209,7 @@ public class Factory {
     public static ObjectMessage createAck(Plaintext plaintext) {
         if (plaintext == null || plaintext.getAckData() == null)
             return null;
-        Ack ack = new Ack(3, plaintext.getFrom().getStream(), plaintext.getAckData());
-        return new ObjectMessage.Builder().payload(ack).build();
+        GenericPayload ack = new GenericPayload(3, plaintext.getFrom().getStream(), plaintext.getAckData());
+        return new ObjectMessage.Builder().objectType(MSG).payload(ack).build();
     }
 }
diff --git a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
index ed095a8..91dd94e 100644
--- a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
@@ -22,19 +22,22 @@ import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.payload.ObjectType;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
+import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.ports.*;
-import ch.dissem.bitmessage.utils.MessageMatchers;
-import ch.dissem.bitmessage.utils.Singleton;
-import ch.dissem.bitmessage.utils.TestUtils;
+import ch.dissem.bitmessage.utils.*;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.*;
+import java.util.Collections;
+import java.util.stream.Collectors;
 
 import static ch.dissem.bitmessage.entity.payload.ObjectType.*;
 import static ch.dissem.bitmessage.utils.MessageMatchers.object;
+import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.*;
@@ -59,9 +62,41 @@ public class BitmessageContextTest {
                 .messageRepo(mock(MessageRepository.class))
                 .networkHandler(mock(NetworkHandler.class))
                 .nodeRegistry(mock(NodeRegistry.class))
-                .powRepo(mock(ProofOfWorkRepository.class))
-                .proofOfWorkEngine(mock(ProofOfWorkEngine.class))
+                .powRepo(spy(new ProofOfWorkRepository() {
+                    Map<InventoryVector, Item> items = new HashMap<>();
+
+                    @Override
+                    public Item getItem(byte[] initialHash) {
+                        return items.get(new InventoryVector(initialHash));
+                    }
+
+                    @Override
+                    public List<byte[]> getItems() {
+                        List<byte[]> result = new LinkedList<>();
+                        for (InventoryVector iv : items.keySet()) {
+                            result.add(iv.getHash());
+                        }
+                        return result;
+                    }
+
+                    @Override
+                    public void putObject(ObjectMessage object, long nonceTrialsPerByte, long extraBytes) {
+                        items.put(new InventoryVector(security().getInitialHash(object)), new Item(object, nonceTrialsPerByte, extraBytes));
+                    }
+
+                    @Override
+                    public void removeObject(byte[] initialHash) {
+                        items.remove(initialHash);
+                    }
+                }))
+                .proofOfWorkEngine(spy(new ProofOfWorkEngine() {
+                    @Override
+                    public void calculateNonce(byte[] initialHash, byte[] target, Callback callback) {
+                        callback.onNonceCalculated(initialHash, new byte[8]);
+                    }
+                }))
                 .build();
+        TTL.msg(2 * MINUTE);
     }
 
     @Test
@@ -161,6 +196,7 @@ public class BitmessageContextTest {
     public void ensureMessageIsSent() throws Exception {
         ctx.send(TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8"), TestUtils.loadContact(),
                 "Subject", "Message");
+        assertEquals(1, ctx.internals().getProofOfWorkRepository().getItems().size());
         verify(ctx.internals().getProofOfWorkRepository(), timeout(10000).atLeastOnce())
                 .putObject(object(MSG), eq(1000L), eq(1000L));
         verify(ctx.messages(), timeout(10000).atLeastOnce()).save(MessageMatchers.plaintext(Plaintext.Type.MSG));
diff --git a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
index e225924..eacaab2 100644
--- a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
@@ -66,6 +66,7 @@ public class DefaultMessageListenerTest extends TestBase {
         when(ctx.getMessageRepository()).thenReturn(messageRepo);
         when(ctx.getInventory()).thenReturn(inventory);
         when(ctx.getNetworkHandler()).thenReturn(networkHandler);
+        when(ctx.getLabeler()).thenReturn(mock(Labeler.class));
 
         listener = new DefaultMessageListener(ctx, mock(Labeler.class), mock(BitmessageContext.Listener.class));
     }
diff --git a/core/src/test/java/ch/dissem/bitmessage/EncryptionTest.java b/core/src/test/java/ch/dissem/bitmessage/EncryptionTest.java
index 9a24842..be57e4a 100644
--- a/core/src/test/java/ch/dissem/bitmessage/EncryptionTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/EncryptionTest.java
@@ -42,7 +42,7 @@ public class EncryptionTest extends TestBase {
         PrivateKey privateKey = new PrivateKey(false, 1, 1000, 1000);
         CryptoBox cryptoBox = new CryptoBox(before, privateKey.getPubkey().getEncryptionKey());
 
-        GenericPayload after = GenericPayload.read(0, cryptoBox.decrypt(privateKey.getPrivateEncryptionKey()), 1, 100);
+        GenericPayload after = GenericPayload.read(0, 1, cryptoBox.decrypt(privateKey.getPrivateEncryptionKey()), 100);
 
         assertEquals(before, after);
     }
diff --git a/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java b/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
index e66beb1..fa58cfe 100644
--- a/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
@@ -65,6 +65,7 @@ public class ProofOfWorkServiceTest {
         when(ctx.getInventory()).thenReturn(inventory);
         when(ctx.getNetworkHandler()).thenReturn(networkHandler);
         when(ctx.getMessageRepository()).thenReturn(messageRepo);
+        when(ctx.getLabeler()).thenReturn(mock(Labeler.class));
 
         proofOfWorkService = new ProofOfWorkService();
         proofOfWorkService.setContext(ctx);
diff --git a/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java b/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
index 5d8777a..aa08475 100644
--- a/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
@@ -82,7 +82,7 @@ public class SerializationTest extends TestBase {
                 .from(TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8"))
                 .to(TestUtils.loadContact())
                 .message("Subject", "Message")
-                .ack("ack".getBytes())
+                .ackData("ack".getBytes())
                 .signature(new byte[0])
                 .build();
         ByteArrayOutputStream out = new ByteArrayOutputStream();
diff --git a/core/src/test/java/ch/dissem/bitmessage/utils/TestUtils.java b/core/src/test/java/ch/dissem/bitmessage/utils/TestUtils.java
index 770039d..21f85ff 100644
--- a/core/src/test/java/ch/dissem/bitmessage/utils/TestUtils.java
+++ b/core/src/test/java/ch/dissem/bitmessage/utils/TestUtils.java
@@ -72,7 +72,7 @@ public class TestUtils {
 
     public static BitmessageAddress loadContact() throws IOException, DecryptionFailedException {
         BitmessageAddress address = new BitmessageAddress("BM-2cXxfcSetKnbHJX2Y85rSkaVpsdNUZ5q9h");
-        ObjectMessage object = TestUtils.loadObjectMessage(4, "V4Pubkey.payload");
+        ObjectMessage object = TestUtils.loadObjectMessage(3, "V4Pubkey.payload");
         object.decrypt(address.getPublicDecryptionKey());
         address.setPubkey((V4Pubkey) object.getPayload());
         return address;
diff --git a/cryptography-bc/src/test/java/ch/dissem/bitmessage/security/CryptographyTest.java b/cryptography-bc/src/test/java/ch/dissem/bitmessage/security/CryptographyTest.java
index 3e5695c..b0937d3 100644
--- a/cryptography-bc/src/test/java/ch/dissem/bitmessage/security/CryptographyTest.java
+++ b/cryptography-bc/src/test/java/ch/dissem/bitmessage/security/CryptographyTest.java
@@ -21,9 +21,7 @@ import java.io.IOException;
 import static ch.dissem.bitmessage.utils.UnixTime.DAY;
 import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
@@ -82,7 +80,7 @@ public class CryptographyTest {
                 .nonce(new byte[8])
                 .expiresTime(UnixTime.now(+28 * DAY))
                 .objectType(0)
-                .payload(GenericPayload.read(0, new ByteArrayInputStream(new byte[0]), 1, 0))
+                .payload(GenericPayload.read(0, 1, new ByteArrayInputStream(new byte[0]), 0))
                 .build();
         crypto.checkProofOfWork(objectMessage, 1000, 1000);
     }
@@ -93,7 +91,7 @@ public class CryptographyTest {
                 .nonce(new byte[8])
                 .expiresTime(UnixTime.now(+2 * MINUTE))
                 .objectType(0)
-                .payload(GenericPayload.read(0, new ByteArrayInputStream(new byte[0]), 1, 0))
+                .payload(GenericPayload.read(0, 1, new ByteArrayInputStream(new byte[0]), 0))
                 .build();
         final CallbackWaiter<byte[]> waiter = new CallbackWaiter<>();
         crypto.doProofOfWork(objectMessage, 1000, 1000,
diff --git a/extensions/src/test/java/ch/dissem/bitmessage/extensions/CryptoCustomMessageTest.java b/extensions/src/test/java/ch/dissem/bitmessage/extensions/CryptoCustomMessageTest.java
index c1303e3..d451323 100644
--- a/extensions/src/test/java/ch/dissem/bitmessage/extensions/CryptoCustomMessageTest.java
+++ b/extensions/src/test/java/ch/dissem/bitmessage/extensions/CryptoCustomMessageTest.java
@@ -52,7 +52,7 @@ public class CryptoCustomMessageTest extends TestBase {
                 new CryptoCustomMessage.Reader<GenericPayload>() {
                     @Override
                     public GenericPayload read(BitmessageAddress ignore, InputStream in) throws IOException {
-                        return GenericPayload.read(0, in, 1, 100);
+                        return GenericPayload.read(0, 1, in, 100);
                     }
                 });
         GenericPayload payloadAfter = messageAfter.decrypt(sendingIdentity.getPublicDecryptionKey());

From 678a48ac3fc729ff6c472b95e0d0b729f6052db0 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Thu, 5 May 2016 10:50:22 +0200
Subject: [PATCH 36/87] Fixed system test and ProofOfWorkService

---
 .../dissem/bitmessage/BitmessageContext.java  | 30 ++----
 .../bitmessage/DefaultMessageListener.java    |  7 +-
 .../ch/dissem/bitmessage/InternalContext.java | 33 +++----
 .../dissem/bitmessage/ProofOfWorkService.java | 60 ++++++++----
 .../bitmessage/entity/BitmessageAddress.java  | 16 ++--
 .../bitmessage/entity/NetworkMessage.java     |  4 +-
 .../bitmessage/entity/ObjectMessage.java      |  8 +-
 .../dissem/bitmessage/entity/Plaintext.java   |  4 +-
 .../bitmessage/entity/payload/Broadcast.java  |  4 +-
 .../bitmessage/entity/payload/CryptoBox.java  | 24 ++---
 .../bitmessage/entity/payload/Pubkey.java     |  6 +-
 .../entity/valueobject/PrivateKey.java        | 22 ++---
 .../ch/dissem/bitmessage/factory/Factory.java |  6 +-
 .../bitmessage/factory/V3MessageFactory.java  |  4 +-
 .../bitmessage/ports/MessageRepository.java   |  2 +
 .../ports/ProofOfWorkRepository.java          | 14 +++
 .../ch/dissem/bitmessage/utils/Singleton.java |  2 +-
 .../bitmessage/BitmessageContextTest.java     | 18 ++--
 .../DefaultMessageListenerTest.java           |  2 +-
 .../ch/dissem/bitmessage/EncryptionTest.java  |  4 +-
 .../entity/BitmessageAddressTest.java         |  8 +-
 .../bitmessage/entity/SerializationTest.java  |  4 +-
 .../ports/ProofOfWorkEngineTest.java          | 10 +-
 .../extensions/CryptoCustomMessage.java       |  6 +-
 .../extensions/CryptoCustomMessageTest.java   | 10 +-
 .../bitmessage/networking/Connection.java     |  4 +-
 repositories/build.gradle                     |  1 +
 .../repository/JdbcMessageRepository.java     | 18 ++++
 .../repository/JdbcProofOfWorkRepository.java | 66 ++++++++++----
 .../db/migration/V3.1__Update_table_POW.sql   |  2 +
 .../repository/JdbcAddressRepositoryTest.java |  6 +-
 .../repository/JdbcMessageRepositoryTest.java |  8 +-
 .../JdbcProofOfWorkRepositoryTest.java        | 91 ++++++++++++++++++-
 .../ch/dissem/bitmessage/wif/WifExporter.java |  4 +-
 .../ch/dissem/bitmessage/wif/WifImporter.java |  4 +-
 35 files changed, 339 insertions(+), 173 deletions(-)
 create mode 100644 repositories/src/main/resources/db/migration/V3.1__Update_table_POW.sql

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index b19c303..d46c36c 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -18,12 +18,9 @@ package ch.dissem.bitmessage;
 
 import ch.dissem.bitmessage.entity.*;
 import ch.dissem.bitmessage.entity.payload.Broadcast;
-import ch.dissem.bitmessage.entity.payload.Msg;
-import ch.dissem.bitmessage.entity.payload.ObjectPayload;
 import ch.dissem.bitmessage.entity.payload.ObjectType;
 import ch.dissem.bitmessage.entity.payload.Pubkey.Feature;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
-import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.*;
@@ -178,23 +175,16 @@ public class BitmessageContext {
         if (to == null || to.getPubkey() != null) {
             LOG.info("Sending message.");
             ctx.getMessageRepository().save(msg);
-            ctx.send(
-                    msg.getFrom(),
-                    to,
-                    wrapInObjectPayload(msg),
-                    TTL.msg()
-            );
-        }
-    }
-
-    private ObjectPayload wrapInObjectPayload(Plaintext msg) {
-        switch (msg.getType()) {
-            case MSG:
-                return new Msg(msg);
-            case BROADCAST:
-                return Factory.getBroadcast(msg);
-            default:
-                throw new ApplicationException("Unknown message type " + msg.getType());
+            if (msg.getType() == MSG) {
+                ctx.send(msg, TTL.msg());
+            } else {
+                ctx.send(
+                        msg.getFrom(),
+                        to,
+                        Factory.getBroadcast(msg),
+                        TTL.msg()
+                );
+            }
         }
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
index ce7ab8d..14c405c 100644
--- a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
+++ b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
@@ -111,12 +111,7 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
         for (Plaintext msg : messages) {
             ctx.getLabeler().markAsSending(msg);
             ctx.getMessageRepository().save(msg);
-            ctx.send(
-                    msg.getFrom(),
-                    msg.getTo(),
-                    new Msg(msg),
-                    +2 * DAY
-            );
+            ctx.send(msg, +2 * DAY);
         }
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
index 58333d5..884dd16 100644
--- a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
@@ -160,6 +160,15 @@ public class InternalContext {
         return port;
     }
 
+    public void send(final Plaintext plaintext, final long timeToLive) {
+        if (plaintext.getAckMessage() != null) {
+            long expires = UnixTime.now(+timeToLive);
+            proofOfWorkService.doProofOfWorkWithAck(plaintext, expires);
+        } else {
+            send(plaintext.getFrom(), plaintext.getTo(), new Msg(plaintext), timeToLive);
+        }
+    }
+
     public void send(final BitmessageAddress from, BitmessageAddress to, final ObjectPayload payload,
                      final long timeToLive) {
         try {
@@ -174,26 +183,12 @@ public class InternalContext {
             if (object.isSigned()) {
                 object.sign(from.getPrivateKey());
             }
-            if (payload instanceof Msg && recipient.has(Pubkey.Feature.DOES_ACK)) {
-                final ObjectMessage ackMessage = ((Msg) payload).getPlaintext().getAckMessage();
-                cryptography.doProofOfWork(ackMessage, NETWORK_NONCE_TRIALS_PER_BYTE, NETWORK_EXTRA_BYTES, new ProofOfWorkEngine.Callback() {
-                    @Override
-                    public void onNonceCalculated(byte[] initialHash, byte[] nonce) {
-                        // FIXME: the message gets lost if calculation is cancelled
-                        // (e.g. by terminating the application)
-                        ackMessage.setNonce(nonce);
-                        object.encrypt(recipient.getPubkey());
-                        proofOfWorkService.doProofOfWork(recipient, object);
-                    }
-                });
-            } else {
-                if (payload instanceof Broadcast) {
-                    ((Broadcast) payload).encrypt();
-                } else if (payload instanceof Encrypted) {
-                    object.encrypt(recipient.getPubkey());
-                }
-                proofOfWorkService.doProofOfWork(to, object);
+            if (payload instanceof Broadcast) {
+                ((Broadcast) payload).encrypt();
+            } else if (payload instanceof Encrypted) {
+                object.encrypt(recipient.getPubkey());
             }
+            proofOfWorkService.doProofOfWork(to, object);
         } catch (IOException e) {
             throw new ApplicationException(e);
         }
diff --git a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
index 98fc9a1..6df0cc0 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
@@ -1,14 +1,15 @@
 package ch.dissem.bitmessage;
 
-import ch.dissem.bitmessage.entity.BitmessageAddress;
-import ch.dissem.bitmessage.entity.ObjectMessage;
-import ch.dissem.bitmessage.entity.Plaintext;
-import ch.dissem.bitmessage.entity.PlaintextHolder;
+import ch.dissem.bitmessage.entity.*;
+import ch.dissem.bitmessage.entity.payload.Broadcast;
+import ch.dissem.bitmessage.entity.payload.Msg;
+import ch.dissem.bitmessage.entity.payload.ObjectPayload;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.ports.Cryptography;
 import ch.dissem.bitmessage.ports.MessageRepository;
 import ch.dissem.bitmessage.ports.ProofOfWorkEngine;
 import ch.dissem.bitmessage.ports.ProofOfWorkRepository;
+import ch.dissem.bitmessage.ports.ProofOfWorkRepository.Item;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -16,7 +17,7 @@ import java.util.List;
 
 import static ch.dissem.bitmessage.InternalContext.NETWORK_EXTRA_BYTES;
 import static ch.dissem.bitmessage.InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE;
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 /**
  * @author Christian Basler
@@ -35,7 +36,7 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
 
         LOG.info("Doing POW for " + items.size() + " tasks.");
         for (byte[] initialHash : items) {
-            ProofOfWorkRepository.Item item = powRepo.getItem(initialHash);
+            Item item = powRepo.getItem(initialHash);
             cryptography.doProofOfWork(item.object, item.nonceTrialsPerByte, item.extraBytes, this);
         }
     }
@@ -59,25 +60,50 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
         cryptography.doProofOfWork(object, nonceTrialsPerByte, extraBytes, this);
     }
 
+    public void doProofOfWorkWithAck(Plaintext plaintext, long expirationTime) {
+        final ObjectMessage ack = plaintext.getAckMessage();
+        Item item = new Item(ack, NETWORK_NONCE_TRIALS_PER_BYTE, NETWORK_EXTRA_BYTES,
+                expirationTime, plaintext);
+        powRepo.putObject(item);
+        cryptography.doProofOfWork(ack, NETWORK_NONCE_TRIALS_PER_BYTE, NETWORK_EXTRA_BYTES, this);
+    }
+
     @Override
     public void onNonceCalculated(byte[] initialHash, byte[] nonce) {
-        ObjectMessage object = powRepo.getItem(initialHash).object;
-        object.setNonce(nonce);
-        Plaintext plaintext = messageRepo.getMessage(initialHash);
-        if (plaintext != null) {
-            plaintext.setInventoryVector(object.getInventoryVector());
-            ctx.getLabeler().markAsSent(plaintext);
-            messageRepo.save(plaintext);
+        Item item = powRepo.getItem(initialHash);
+        if (item.message == null) {
+            ObjectMessage object = powRepo.getItem(initialHash).object;
+            object.setNonce(nonce);
+            Plaintext plaintext = messageRepo.getMessage(initialHash);
+            if (plaintext != null) {
+                plaintext.setInventoryVector(object.getInventoryVector());
+                ctx.getLabeler().markAsSent(plaintext);
+                messageRepo.save(plaintext);
+            }
+            ctx.getInventory().storeObject(object);
+            powRepo.removeObject(initialHash);
+            ctx.getNetworkHandler().offer(object.getInventoryVector());
+        } else {
+            item.message.getAckMessage().setNonce(nonce);
+            final ObjectMessage object = new ObjectMessage.Builder()
+                    .stream(item.message.getStream())
+                    .expiresTime(item.expirationTime)
+                    .payload(new Msg(item.message))
+                    .build();
+            if (object.isSigned()) {
+                object.sign(item.message.getFrom().getPrivateKey());
+            }
+            if (object.getPayload() instanceof Encrypted) {
+                object.encrypt(item.message.getTo().getPubkey());
+            }
+            doProofOfWork(item.message.getTo(), object);
         }
-        ctx.getInventory().storeObject(object);
-        powRepo.removeObject(initialHash);
-        ctx.getNetworkHandler().offer(object.getInventoryVector());
     }
 
     @Override
     public void setContext(InternalContext ctx) {
         this.ctx = ctx;
-        this.cryptography = security();
+        this.cryptography = cryptography();
         this.powRepo = ctx.getProofOfWorkRepository();
         this.messageRepo = ctx.getMessageRepository();
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
index 84b349d..ce199c4 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
@@ -37,7 +37,7 @@ import java.util.Objects;
 
 import static ch.dissem.bitmessage.utils.Decode.bytes;
 import static ch.dissem.bitmessage.utils.Decode.varInt;
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 /**
  * A Bitmessage address. Can be a user's private address, an address string without public keys or a recipient's address
@@ -74,19 +74,19 @@ public class BitmessageAddress implements Serializable {
             Encode.varInt(version, os);
             Encode.varInt(stream, os);
             if (version < 4) {
-                byte[] checksum = security().sha512(os.toByteArray(), ripe);
+                byte[] checksum = cryptography().sha512(os.toByteArray(), ripe);
                 this.tag = null;
                 this.publicDecryptionKey = Arrays.copyOfRange(checksum, 0, 32);
             } else {
                 // for tag and decryption key, the checksum has to be created with 0x00 padding
-                byte[] checksum = security().doubleSha512(os.toByteArray(), ripe);
+                byte[] checksum = cryptography().doubleSha512(os.toByteArray(), ripe);
                 this.tag = Arrays.copyOfRange(checksum, 32, 64);
                 this.publicDecryptionKey = Arrays.copyOfRange(checksum, 0, 32);
             }
             // but for the address and its checksum they need to be stripped
             int offset = Bytes.numberOfLeadingZeros(ripe);
             os.write(ripe, offset, ripe.length - offset);
-            byte[] checksum = security().doubleSha512(os.toByteArray());
+            byte[] checksum = cryptography().doubleSha512(os.toByteArray());
             os.write(checksum, 0, 4);
             this.address = "BM-" + Base58.encode(os.toByteArray());
         } catch (IOException e) {
@@ -147,18 +147,18 @@ public class BitmessageAddress implements Serializable {
             this.ripe = Bytes.expand(bytes(in, bytes.length - counter.length() - 4), 20);
 
             // test checksum
-            byte[] checksum = security().doubleSha512(bytes, bytes.length - 4);
+            byte[] checksum = cryptography().doubleSha512(bytes, bytes.length - 4);
             byte[] expectedChecksum = bytes(in, 4);
             for (int i = 0; i < 4; i++) {
                 if (expectedChecksum[i] != checksum[i])
                     throw new IllegalArgumentException("Checksum of address failed");
             }
             if (version < 4) {
-                checksum = security().sha512(Arrays.copyOfRange(bytes, 0, counter.length()), ripe);
+                checksum = cryptography().sha512(Arrays.copyOfRange(bytes, 0, counter.length()), ripe);
                 this.tag = null;
                 this.publicDecryptionKey = Arrays.copyOfRange(checksum, 0, 32);
             } else {
-                checksum = security().doubleSha512(Arrays.copyOfRange(bytes, 0, counter.length()), ripe);
+                checksum = cryptography().doubleSha512(Arrays.copyOfRange(bytes, 0, counter.length()), ripe);
                 this.tag = Arrays.copyOfRange(checksum, 32, 64);
                 this.publicDecryptionKey = Arrays.copyOfRange(checksum, 0, 32);
             }
@@ -173,7 +173,7 @@ public class BitmessageAddress implements Serializable {
             Encode.varInt(version, out);
             Encode.varInt(stream, out);
             out.write(ripe);
-            return Arrays.copyOfRange(security().doubleSha512(out.toByteArray()), 32, 64);
+            return Arrays.copyOfRange(cryptography().doubleSha512(out.toByteArray()), 32, 64);
         } catch (IOException e) {
             throw new ApplicationException(e);
         }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
index 347af6c..860c6ed 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
@@ -27,7 +27,7 @@ import java.security.GeneralSecurityException;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 /**
  * A network message is exchanged between two nodes.
@@ -51,7 +51,7 @@ public class NetworkMessage implements Streamable {
      * First 4 bytes of sha512(payload)
      */
     private byte[] getChecksum(byte[] bytes) throws NoSuchProviderException, NoSuchAlgorithmException {
-        byte[] d = security().sha512(bytes);
+        byte[] d = cryptography().sha512(bytes);
         return new byte[]{d[0], d[1], d[2], d[3]};
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
index a0878c2..6f74257 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
@@ -32,7 +32,7 @@ import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.Objects;
 
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 /**
  * The 'object' command sends an object that is shared throughout the network.
@@ -96,7 +96,7 @@ public class ObjectMessage implements MessagePayload {
 
     public InventoryVector getInventoryVector() {
         return new InventoryVector(
-                Bytes.truncate(security().doubleSha512(nonce, getPayloadBytesWithoutNonce()), 32)
+                Bytes.truncate(cryptography().doubleSha512(nonce, getPayloadBytesWithoutNonce()), 32)
         );
     }
 
@@ -121,7 +121,7 @@ public class ObjectMessage implements MessagePayload {
 
     public void sign(PrivateKey key) {
         if (payload.isSigned()) {
-            payload.setSignature(security().getSignature(getBytesToSign(), key));
+            payload.setSignature(cryptography().getSignature(getBytesToSign(), key));
         }
     }
 
@@ -155,7 +155,7 @@ public class ObjectMessage implements MessagePayload {
 
     public boolean isSignatureValid(Pubkey pubkey) throws IOException {
         if (isEncrypted()) throw new IllegalStateException("Payload must be decrypted first");
-        return security().isSignatureValid(getBytesToSign(), payload.getSignature(), pubkey);
+        return cryptography().isSignatureValid(getBytesToSign(), payload.getSignature(), pubkey);
     }
 
     @Override
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
index c0a33ef..a2b66f7 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
@@ -28,7 +28,7 @@ import ch.dissem.bitmessage.utils.UnixTime;
 import java.io.*;
 import java.util.*;
 
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 /**
  * The unencrypted message to be sent by 'msg' or 'broadcast'.
@@ -511,7 +511,7 @@ public class Plaintext implements Streamable {
                 to = new BitmessageAddress(0, 0, destinationRipe);
             }
             if (type == Type.MSG && ackMessage == null && ackData == null) {
-                ackData = security().randomBytes(32);
+                ackData = cryptography().randomBytes(32);
             }
             return new Plaintext(this);
         }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java
index 1533a2d..a583330 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Broadcast.java
@@ -26,7 +26,7 @@ import java.io.IOException;
 import java.util.Objects;
 
 import static ch.dissem.bitmessage.entity.Plaintext.Type.BROADCAST;
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 /**
  * Users who are subscribed to the sending address will see the message appear in their inbox.
@@ -81,7 +81,7 @@ public abstract class Broadcast extends ObjectPayload implements Encrypted, Plai
     }
 
     public void encrypt() throws IOException {
-        encrypt(security().createPublicKey(plaintext.getFrom().getPublicDecryptionKey()));
+        encrypt(cryptography().createPublicKey(plaintext.getFrom().getPublicDecryptionKey()));
     }
 
     @Override
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
index 6609070..89d7bd7 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
@@ -27,7 +27,7 @@ import java.io.*;
 import java.util.Arrays;
 
 import static ch.dissem.bitmessage.entity.valueobject.PrivateKey.PRIVATE_KEY_SIZE;
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 
 public class CryptoBox implements Streamable {
@@ -50,22 +50,22 @@ public class CryptoBox implements Streamable {
 
         // 1. The destination public key is called K.
         // 2. Generate 16 random bytes using a secure random number generator. Call them IV.
-        initializationVector = security().randomBytes(16);
+        initializationVector = cryptography().randomBytes(16);
 
         // 3. Generate a new random EC key pair with private key called r and public key called R.
-        byte[] r = security().randomBytes(PRIVATE_KEY_SIZE);
-        R = security().createPublicKey(r);
+        byte[] r = cryptography().randomBytes(PRIVATE_KEY_SIZE);
+        R = cryptography().createPublicKey(r);
         // 4. Do an EC point multiply with public key K and private key r. This gives you public key P.
-        byte[] P = security().multiply(K, r);
+        byte[] P = cryptography().multiply(K, r);
         byte[] X = Points.getX(P);
         // 5. Use the X component of public key P and calculate the SHA512 hash H.
-        byte[] H = security().sha512(X);
+        byte[] H = cryptography().sha512(X);
         // 6. The first 32 bytes of H are called key_e and the last 32 bytes are called key_m.
         byte[] key_e = Arrays.copyOfRange(H, 0, 32);
         byte[] key_m = Arrays.copyOfRange(H, 32, 64);
         // 7. Pad the input text to a multiple of 16 bytes, in accordance to PKCS7.
         // 8. Encrypt the data with AES-256-CBC, using IV as initialization vector, key_e as encryption key and the padded input text as payload. Call the output cipher text.
-        encrypted = security().crypt(true, data, key_e, initializationVector);
+        encrypted = cryptography().crypt(true, data, key_e, initializationVector);
         // 9. Calculate a 32 byte MAC with HMACSHA256, using key_m as salt and IV + R + cipher text as data. Call the output MAC.
         mac = calculateMac(key_m);
 
@@ -75,7 +75,7 @@ public class CryptoBox implements Streamable {
     private CryptoBox(Builder builder) {
         initializationVector = builder.initializationVector;
         curveType = builder.curveType;
-        R = security().createPoint(builder.xComponent, builder.yComponent);
+        R = cryptography().createPoint(builder.xComponent, builder.yComponent);
         encrypted = builder.encrypted;
         mac = builder.mac;
     }
@@ -101,9 +101,9 @@ public class CryptoBox implements Streamable {
     public InputStream decrypt(byte[] k) throws DecryptionFailedException {
         // 1. The private key used to decrypt is called k.
         // 2. Do an EC point multiply with private key k and public key R. This gives you public key P.
-        byte[] P = security().multiply(R, k);
+        byte[] P = cryptography().multiply(R, k);
         // 3. Use the X component of public key P and calculate the SHA512 hash H.
-        byte[] H = security().sha512(Arrays.copyOfRange(P, 1, 33));
+        byte[] H = cryptography().sha512(Arrays.copyOfRange(P, 1, 33));
         // 4. The first 32 bytes of H are called key_e and the last 32 bytes are called key_m.
         byte[] key_e = Arrays.copyOfRange(H, 0, 32);
         byte[] key_m = Arrays.copyOfRange(H, 32, 64);
@@ -116,14 +116,14 @@ public class CryptoBox implements Streamable {
 
         // 7. Decrypt the cipher text with AES-256-CBC, using IV as initialization vector, key_e as decryption key
         //    and the cipher text as payload. The output is the padded input text.
-        return new ByteArrayInputStream(security().crypt(false, encrypted, key_e, initializationVector));
+        return new ByteArrayInputStream(cryptography().crypt(false, encrypted, key_e, initializationVector));
     }
 
     private byte[] calculateMac(byte[] key_m) {
         try {
             ByteArrayOutputStream macData = new ByteArrayOutputStream();
             writeWithoutMAC(macData);
-            return security().mac(key_m, macData.toByteArray());
+            return cryptography().mac(key_m, macData.toByteArray());
         } catch (IOException e) {
             throw new ApplicationException(e);
         }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
index 789c64c..c476bf9 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
@@ -20,7 +20,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
 
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 /**
  * Public keys for signing and encryption, the answer to a 'getpubkey' request.
@@ -35,7 +35,7 @@ public abstract class Pubkey extends ObjectPayload {
     }
 
     public static byte[] getRipe(byte[] publicSigningKey, byte[] publicEncryptionKey) {
-        return security().ripemd160(security().sha512(publicSigningKey, publicEncryptionKey));
+        return cryptography().ripemd160(cryptography().sha512(publicSigningKey, publicEncryptionKey));
     }
 
     public abstract byte[] getSigningKey();
@@ -45,7 +45,7 @@ public abstract class Pubkey extends ObjectPayload {
     public abstract int getBehaviorBitfield();
 
     public byte[] getRipe() {
-        return security().ripemd160(security().sha512(getSigningKey(), getEncryptionKey()));
+        return cryptography().ripemd160(cryptography().sha512(getSigningKey(), getEncryptionKey()));
     }
 
     public long getNonceTrialsPerByte() {
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
index b9c3afb..716afc6 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
@@ -30,7 +30,7 @@ import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 /**
  * Represents a private key. Additional information (stream, version, features, ...) is stored in the accompanying
@@ -53,15 +53,15 @@ public class PrivateKey implements Streamable {
         byte[] pubEK;
         byte[] ripe;
         do {
-            privSK = security().randomBytes(PRIVATE_KEY_SIZE);
-            privEK = security().randomBytes(PRIVATE_KEY_SIZE);
-            pubSK = security().createPublicKey(privSK);
-            pubEK = security().createPublicKey(privEK);
+            privSK = cryptography().randomBytes(PRIVATE_KEY_SIZE);
+            privEK = cryptography().randomBytes(PRIVATE_KEY_SIZE);
+            pubSK = cryptography().createPublicKey(privSK);
+            pubEK = cryptography().createPublicKey(privEK);
             ripe = Pubkey.getRipe(pubSK, pubEK);
         } while (ripe[0] != 0 || (shorter && ripe[1] != 0));
         this.privateSigningKey = privSK;
         this.privateEncryptionKey = privEK;
-        this.pubkey = security().createPubkey(Pubkey.LATEST_VERSION, stream, privateSigningKey, privateEncryptionKey,
+        this.pubkey = cryptography().createPubkey(Pubkey.LATEST_VERSION, stream, privateSigningKey, privateEncryptionKey,
                 nonceTrialsPerByte, extraBytes, features);
     }
 
@@ -118,11 +118,11 @@ public class PrivateKey implements Streamable {
                 long encryptionKeyNonce = nextNonce + 1;
                 byte[] ripe;
                 do {
-                    privEK = Bytes.truncate(security().sha512(seed, Encode.varInt(encryptionKeyNonce)), 32);
-                    privSK = Bytes.truncate(security().sha512(seed, Encode.varInt(signingKeyNonce)), 32);
-                    pubSK = security().createPublicKey(privSK);
-                    pubEK = security().createPublicKey(privEK);
-                    ripe = security().ripemd160(security().sha512(pubSK, pubEK));
+                    privEK = Bytes.truncate(cryptography().sha512(seed, Encode.varInt(encryptionKeyNonce)), 32);
+                    privSK = Bytes.truncate(cryptography().sha512(seed, Encode.varInt(signingKeyNonce)), 32);
+                    pubSK = cryptography().createPublicKey(privSK);
+                    pubEK = cryptography().createPublicKey(privEK);
+                    ripe = cryptography().ripemd160(cryptography().sha512(pubSK, pubEK));
 
                     signingKeyNonce += 2;
                     encryptionKeyNonce += 2;
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
index cfa3229..49db9d6 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
@@ -32,7 +32,7 @@ import java.net.SocketException;
 import java.net.SocketTimeoutException;
 
 import static ch.dissem.bitmessage.entity.payload.ObjectType.MSG;
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 /**
  * Creates {@link NetworkMessage} objects from {@link InputStream InputStreams}
@@ -117,8 +117,8 @@ public class Factory {
         BitmessageAddress temp = new BitmessageAddress(address);
         PrivateKey privateKey = new PrivateKey(privateSigningKey, privateEncryptionKey,
                 createPubkey(temp.getVersion(), temp.getStream(),
-                        security().createPublicKey(privateSigningKey),
-                        security().createPublicKey(privateEncryptionKey),
+                        cryptography().createPublicKey(privateSigningKey),
+                        cryptography().createPublicKey(privateEncryptionKey),
                         nonceTrialsPerByte, extraBytes, behaviourBitfield));
         BitmessageAddress result = new BitmessageAddress(privateKey);
         if (!result.getAddress().equals(address)) {
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java
index d13e73e..af9839f 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java
@@ -32,7 +32,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import static ch.dissem.bitmessage.entity.NetworkMessage.MAGIC_BYTES;
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 /**
  * Creates protocol v3 network messages from {@link InputStream InputStreams}
@@ -183,7 +183,7 @@ class V3MessageFactory {
     }
 
     private static boolean testChecksum(byte[] checksum, byte[] payload) {
-        byte[] payloadChecksum = security().sha512(payload);
+        byte[] payloadChecksum = cryptography().sha512(payload);
         for (int i = 0; i < checksum.length; i++) {
             if (checksum[i] != payloadChecksum[i]) {
                 return false;
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java b/core/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java
index 9e949a7..c4cff5c 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java
@@ -30,6 +30,8 @@ public interface MessageRepository {
 
     int countUnread(Label label);
 
+    Plaintext getMessage(Object id);
+
     Plaintext getMessage(byte[] initialHash);
 
     List<Plaintext> findMessages(Label label);
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkRepository.java b/core/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkRepository.java
index 739c172..61dc2ab 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkRepository.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkRepository.java
@@ -1,6 +1,8 @@
 package ch.dissem.bitmessage.ports;
 
+import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.ObjectMessage;
+import ch.dissem.bitmessage.entity.Plaintext;
 
 import java.util.List;
 
@@ -16,6 +18,8 @@ public interface ProofOfWorkRepository {
 
     void putObject(ObjectMessage object, long nonceTrialsPerByte, long extraBytes);
 
+    void putObject(Item item);
+
     void removeObject(byte[] initialHash);
 
     class Item {
@@ -23,10 +27,20 @@ public interface ProofOfWorkRepository {
         public final long nonceTrialsPerByte;
         public final long extraBytes;
 
+        // Needed for ACK POW calculation
+        public final Long expirationTime;
+        public final Plaintext message;
+
         public Item(ObjectMessage object, long nonceTrialsPerByte, long extraBytes) {
+            this(object, nonceTrialsPerByte, extraBytes, 0, null);
+        }
+
+        public Item(ObjectMessage object, long nonceTrialsPerByte, long extraBytes, long expirationTime, Plaintext message) {
             this.object = object;
             this.nonceTrialsPerByte = nonceTrialsPerByte;
             this.extraBytes = extraBytes;
+            this.expirationTime = expirationTime;
+            this.message = message;
         }
     }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/utils/Singleton.java b/core/src/main/java/ch/dissem/bitmessage/utils/Singleton.java
index a751c65..2eeaa97 100644
--- a/core/src/main/java/ch/dissem/bitmessage/utils/Singleton.java
+++ b/core/src/main/java/ch/dissem/bitmessage/utils/Singleton.java
@@ -30,7 +30,7 @@ public class Singleton {
         }
     }
 
-    public static Cryptography security() {
+    public static Cryptography cryptography() {
         return cryptography;
     }
 }
diff --git a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
index 91dd94e..6e49853 100644
--- a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
@@ -24,19 +24,20 @@ import ch.dissem.bitmessage.entity.payload.ObjectType;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.ports.*;
-import ch.dissem.bitmessage.utils.*;
+import ch.dissem.bitmessage.utils.MessageMatchers;
+import ch.dissem.bitmessage.utils.Singleton;
+import ch.dissem.bitmessage.utils.TTL;
+import ch.dissem.bitmessage.utils.TestUtils;
 import org.hamcrest.BaseMatcher;
 import org.hamcrest.Description;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.util.*;
-import java.util.Collections;
-import java.util.stream.Collectors;
 
 import static ch.dissem.bitmessage.entity.payload.ObjectType.*;
 import static ch.dissem.bitmessage.utils.MessageMatchers.object;
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
@@ -79,9 +80,14 @@ public class BitmessageContextTest {
                         return result;
                     }
 
+                    @Override
+                    public void putObject(Item item) {
+                        items.put(new InventoryVector(cryptography().getInitialHash(item.object)), item);
+                    }
+
                     @Override
                     public void putObject(ObjectMessage object, long nonceTrialsPerByte, long extraBytes) {
-                        items.put(new InventoryVector(security().getInitialHash(object)), new Item(object, nonceTrialsPerByte, extraBytes));
+                        items.put(new InventoryVector(cryptography().getInitialHash(object)), new Item(object, nonceTrialsPerByte, extraBytes));
                     }
 
                     @Override
@@ -196,7 +202,7 @@ public class BitmessageContextTest {
     public void ensureMessageIsSent() throws Exception {
         ctx.send(TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8"), TestUtils.loadContact(),
                 "Subject", "Message");
-        assertEquals(1, ctx.internals().getProofOfWorkRepository().getItems().size());
+        assertEquals(2, ctx.internals().getProofOfWorkRepository().getItems().size());
         verify(ctx.internals().getProofOfWorkRepository(), timeout(10000).atLeastOnce())
                 .putObject(object(MSG), eq(1000L), eq(1000L));
         verify(ctx.messages(), timeout(10000).atLeastOnce()).save(MessageMatchers.plaintext(Plaintext.Type.MSG));
diff --git a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
index eacaab2..170cb93 100644
--- a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
@@ -99,7 +99,7 @@ public class DefaultMessageListenerTest extends TestBase {
                 .payload(identity.getPubkey())
                 .build();
         objectMessage.sign(identity.getPrivateKey());
-        objectMessage.encrypt(Singleton.security().createPublicKey(identity.getPublicDecryptionKey()));
+        objectMessage.encrypt(Singleton.cryptography().createPublicKey(identity.getPublicDecryptionKey()));
         listener.receive(objectMessage);
 
         verify(addressRepo).save(any(BitmessageAddress.class));
diff --git a/core/src/test/java/ch/dissem/bitmessage/EncryptionTest.java b/core/src/test/java/ch/dissem/bitmessage/EncryptionTest.java
index be57e4a..0a6ee25 100644
--- a/core/src/test/java/ch/dissem/bitmessage/EncryptionTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/EncryptionTest.java
@@ -30,14 +30,14 @@ import org.junit.Test;
 
 import java.io.IOException;
 
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 public class EncryptionTest extends TestBase {
     @Test
     public void ensureDecryptedDataIsSameAsBeforeEncryption() throws IOException, DecryptionFailedException {
-        GenericPayload before = new GenericPayload(0, 1, security().randomBytes(100));
+        GenericPayload before = new GenericPayload(0, 1, cryptography().randomBytes(100));
 
         PrivateKey privateKey = new PrivateKey(false, 1, 1000, 1000);
         CryptoBox cryptoBox = new CryptoBox(before, privateKey.getPubkey().getEncryptionKey());
diff --git a/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java b/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
index 5d10cdf..fced84f 100644
--- a/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/entity/BitmessageAddressTest.java
@@ -28,7 +28,7 @@ import java.util.Arrays;
 
 import static ch.dissem.bitmessage.entity.payload.Pubkey.Feature.DOES_ACK;
 import static ch.dissem.bitmessage.entity.payload.Pubkey.Feature.INCLUDE_DESTINATION;
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 import static org.junit.Assert.*;
 
 public class BitmessageAddressTest extends TestBase {
@@ -126,7 +126,7 @@ public class BitmessageAddressTest extends TestBase {
         System.out.println("\n\n" + Strings.hex(privsigningkey) + "\n\n");
 
         BitmessageAddress address = new BitmessageAddress(new PrivateKey(privsigningkey, privencryptionkey,
-                security().createPubkey(3, 1, privsigningkey, privencryptionkey, 320, 14000)));
+                cryptography().createPubkey(3, 1, privsigningkey, privencryptionkey, 320, 14000)));
         assertEquals(address_string, address.getAddress());
     }
 
@@ -136,7 +136,7 @@ public class BitmessageAddressTest extends TestBase {
         byte[] privsigningkey = getSecret("5KMWqfCyJZGFgW6QrnPJ6L9Gatz25B51y7ErgqNr1nXUVbtZbdU");
         byte[] privencryptionkey = getSecret("5JXXWEuhHQEPk414SzEZk1PHDRi8kCuZd895J7EnKeQSahJPxGz");
         BitmessageAddress address = new BitmessageAddress(new PrivateKey(privsigningkey, privencryptionkey,
-                security().createPubkey(4, 1, privsigningkey, privencryptionkey, 320, 14000)));
+                cryptography().createPubkey(4, 1, privsigningkey, privencryptionkey, 320, 14000)));
         assertEquals("BM-2cV5f9EpzaYARxtoruSpa6pDoucSf9ZNke", address.getAddress());
     }
 
@@ -151,7 +151,7 @@ public class BitmessageAddressTest extends TestBase {
         if (bytes.length != 37)
             throw new IOException("Unknown format: 37 bytes expected, but secret " + walletImportFormat + " was " + bytes.length + " long");
 
-        byte[] hash = security().doubleSha256(bytes, 33);
+        byte[] hash = cryptography().doubleSha256(bytes, 33);
         for (int i = 0; i < 4; i++) {
             if (hash[i] != bytes[33 + i]) throw new IOException("Hash check failed for secret " + walletImportFormat);
         }
diff --git a/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java b/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
index aa08475..26d8a35 100644
--- a/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
@@ -30,7 +30,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 
 import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 import static org.junit.Assert.*;
 
 public class SerializationTest extends TestBase {
@@ -102,7 +102,7 @@ public class SerializationTest extends TestBase {
     public void ensureNetworkMessageIsSerializedAndDeserializedCorrectly() throws Exception {
         ArrayList<InventoryVector> ivs = new ArrayList<>(50000);
         for (int i = 0; i < 50000; i++) {
-            ivs.add(new InventoryVector(security().randomBytes(32)));
+            ivs.add(new InventoryVector(cryptography().randomBytes(32)));
         }
 
         Inv inv = new Inv.Builder().inventory(ivs).build();
diff --git a/core/src/test/java/ch/dissem/bitmessage/ports/ProofOfWorkEngineTest.java b/core/src/test/java/ch/dissem/bitmessage/ports/ProofOfWorkEngineTest.java
index 1ed4aac..c2efb1f 100644
--- a/core/src/test/java/ch/dissem/bitmessage/ports/ProofOfWorkEngineTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/ports/ProofOfWorkEngineTest.java
@@ -21,7 +21,7 @@ import ch.dissem.bitmessage.utils.CallbackWaiter;
 import ch.dissem.bitmessage.utils.TestBase;
 import org.junit.Test;
 
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 import static org.junit.Assert.assertTrue;
 
 public class ProofOfWorkEngineTest extends TestBase {
@@ -36,7 +36,7 @@ public class ProofOfWorkEngineTest extends TestBase {
     }
 
     private void testPOW(ProofOfWorkEngine engine) throws InterruptedException {
-        byte[] initialHash = security().sha512(new byte[]{1, 3, 6, 4});
+        byte[] initialHash = cryptography().sha512(new byte[]{1, 3, 6, 4});
         byte[] target = {0, 0, 0, -1, -1, -1, -1, -1};
 
         final CallbackWaiter<byte[]> waiter1 = new CallbackWaiter<>();
@@ -49,10 +49,10 @@ public class ProofOfWorkEngineTest extends TestBase {
                 });
         byte[] nonce = waiter1.waitForValue();
         System.out.println("Calculating nonce took " + waiter1.getTime() + "ms");
-        assertTrue(Bytes.lt(security().doubleSha512(nonce, initialHash), target, 8));
+        assertTrue(Bytes.lt(cryptography().doubleSha512(nonce, initialHash), target, 8));
 
         // Let's add a second (shorter) run to find possible multi threading issues
-        byte[] initialHash2 = security().sha512(new byte[]{1, 3, 6, 5});
+        byte[] initialHash2 = cryptography().sha512(new byte[]{1, 3, 6, 5});
         byte[] target2 = {0, 0, -1, -1, -1, -1, -1, -1};
 
         final CallbackWaiter<byte[]> waiter2 = new CallbackWaiter<>();
@@ -65,7 +65,7 @@ public class ProofOfWorkEngineTest extends TestBase {
                 });
         byte[] nonce2 = waiter2.waitForValue();
         System.out.println("Calculating nonce took " + waiter2.getTime() + "ms");
-        assertTrue(Bytes.lt(security().doubleSha512(nonce2, initialHash2), target2, 8));
+        assertTrue(Bytes.lt(cryptography().doubleSha512(nonce2, initialHash2), target2, 8));
         assertTrue("Second nonce must be quicker to find", waiter1.getTime() > waiter2.getTime());
     }
 
diff --git a/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java b/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java
index 0b5b142..7955e5b 100644
--- a/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java
+++ b/extensions/src/main/java/ch/dissem/bitmessage/extensions/CryptoCustomMessage.java
@@ -28,7 +28,7 @@ import ch.dissem.bitmessage.utils.Encode;
 import java.io.*;
 
 import static ch.dissem.bitmessage.utils.Decode.*;
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 /**
  * A {@link CustomMessage} implementation that contains signed and encrypted data.
@@ -80,7 +80,7 @@ public class CryptoCustomMessage<T extends Streamable> extends CustomMessage {
         }
 
         data.write(out);
-        Encode.varBytes(security().getSignature(out.toByteArray(), identity.getPrivateKey()), out);
+        Encode.varBytes(cryptography().getSignature(out.toByteArray(), identity.getPrivateKey()), out);
         container = new CryptoBox(out.toByteArray(), publicKey);
     }
 
@@ -138,7 +138,7 @@ public class CryptoCustomMessage<T extends Streamable> extends CustomMessage {
         }
 
         public void checkSignature(Pubkey pubkey) throws IOException, IllegalStateException {
-            if (!security().isSignatureValid(out.toByteArray(), varBytes(wrapped), pubkey)) {
+            if (!cryptography().isSignatureValid(out.toByteArray(), varBytes(wrapped), pubkey)) {
                 throw new IllegalStateException("Signature check failed");
             }
         }
diff --git a/extensions/src/test/java/ch/dissem/bitmessage/extensions/CryptoCustomMessageTest.java b/extensions/src/test/java/ch/dissem/bitmessage/extensions/CryptoCustomMessageTest.java
index d451323..bf0fa6d 100644
--- a/extensions/src/test/java/ch/dissem/bitmessage/extensions/CryptoCustomMessageTest.java
+++ b/extensions/src/test/java/ch/dissem/bitmessage/extensions/CryptoCustomMessageTest.java
@@ -30,7 +30,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 import static org.junit.Assert.assertEquals;
 
 public class CryptoCustomMessageTest extends TestBase {
@@ -39,9 +39,9 @@ public class CryptoCustomMessageTest extends TestBase {
         PrivateKey privateKey = PrivateKey.read(TestUtils.getResource("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8.privkey"));
         BitmessageAddress sendingIdentity = new BitmessageAddress(privateKey);
 
-        GenericPayload payloadBefore = new GenericPayload(0, 1, security().randomBytes(100));
+        GenericPayload payloadBefore = new GenericPayload(0, 1, cryptography().randomBytes(100));
         CryptoCustomMessage<GenericPayload> messageBefore = new CryptoCustomMessage<>(payloadBefore);
-        messageBefore.signAndEncrypt(sendingIdentity, security().createPublicKey(sendingIdentity.getPublicDecryptionKey()));
+        messageBefore.signAndEncrypt(sendingIdentity, cryptography().createPublicKey(sendingIdentity.getPublicDecryptionKey()));
 
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         messageBefore.write(out);
@@ -65,11 +65,11 @@ public class CryptoCustomMessageTest extends TestBase {
         PrivateKey privateKey = PrivateKey.read(TestUtils.getResource("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8.privkey"));
         final BitmessageAddress sendingIdentity = new BitmessageAddress(privateKey);
 
-        ProofOfWorkRequest requestBefore = new ProofOfWorkRequest(sendingIdentity, security().randomBytes(64),
+        ProofOfWorkRequest requestBefore = new ProofOfWorkRequest(sendingIdentity, cryptography().randomBytes(64),
                 ProofOfWorkRequest.Request.CALCULATE);
 
         CryptoCustomMessage<ProofOfWorkRequest> messageBefore = new CryptoCustomMessage<>(requestBefore);
-        messageBefore.signAndEncrypt(sendingIdentity, security().createPublicKey(sendingIdentity.getPublicDecryptionKey()));
+        messageBefore.signAndEncrypt(sendingIdentity, cryptography().createPublicKey(sendingIdentity.getPublicDecryptionKey()));
 
 
         ByteArrayOutputStream out = new ByteArrayOutputStream();
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
index 54c8acf..4717675 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
@@ -46,7 +46,7 @@ import static ch.dissem.bitmessage.InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE
 import static ch.dissem.bitmessage.networking.Connection.Mode.CLIENT;
 import static ch.dissem.bitmessage.networking.Connection.Mode.SYNC;
 import static ch.dissem.bitmessage.networking.Connection.State.*;
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
 
 /**
@@ -249,7 +249,7 @@ class Connection {
         }
         try {
             listener.receive(objectMessage);
-            security().checkProofOfWork(objectMessage, NETWORK_NONCE_TRIALS_PER_BYTE, NETWORK_EXTRA_BYTES);
+            cryptography().checkProofOfWork(objectMessage, NETWORK_NONCE_TRIALS_PER_BYTE, NETWORK_EXTRA_BYTES);
             ctx.getInventory().storeObject(objectMessage);
             // offer object to some random nodes so it gets distributed throughout the network:
             networkHandler.offer(objectMessage.getInventoryVector());
diff --git a/repositories/build.gradle b/repositories/build.gradle
index abb8651..2ab092c 100644
--- a/repositories/build.gradle
+++ b/repositories/build.gradle
@@ -18,5 +18,6 @@ dependencies {
     testCompile 'junit:junit:4.12'
     testCompile 'com.h2database:h2:1.4.190'
     testCompile 'org.mockito:mockito-core:1.10.19'
+    testCompile project(path: ':core', configuration: 'testArtifacts')
     testCompile project(':cryptography-bc')
 }
\ No newline at end of file
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
index 8f94d03..ae1b496 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
@@ -117,6 +117,24 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
         return 0;
     }
 
+    @Override
+    public Plaintext getMessage(Object id) {
+        if (id instanceof Long) {
+            List<Plaintext> plaintexts = find("id=" + id);
+            switch (plaintexts.size()) {
+                case 0:
+                    return null;
+                case 1:
+                    return plaintexts.get(0);
+                default:
+                    throw new ApplicationException("This shouldn't happen, found " + plaintexts.size() +
+                            " messages, one or none was expected");
+            }
+        } else {
+            throw new IllegalArgumentException("Long expected for ID");
+        }
+    }
+
     @Override
     public Plaintext getMessage(byte[] initialHash) {
         List<Plaintext> plaintexts = find("initial_hash=X'" + Strings.hex(initialHash) + "'");
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java
index 0fbb2dc..ac6e69f 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java
@@ -1,6 +1,8 @@
 package ch.dissem.bitmessage.repository;
 
+import ch.dissem.bitmessage.InternalContext;
 import ch.dissem.bitmessage.entity.ObjectMessage;
+import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.ProofOfWorkRepository;
@@ -8,18 +10,21 @@ import ch.dissem.bitmessage.utils.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.sql.*;
 import java.util.LinkedList;
 import java.util.List;
 
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 /**
  * @author Christian Basler
  */
-public class JdbcProofOfWorkRepository extends JdbcHelper implements ProofOfWorkRepository {
+public class JdbcProofOfWorkRepository extends JdbcHelper implements ProofOfWorkRepository, InternalContext.ContextHolder {
     private static final Logger LOG = LoggerFactory.getLogger(JdbcProofOfWorkRepository.class);
+    private InternalContext ctx;
 
     public JdbcProofOfWorkRepository(JdbcConfig config) {
         super(config);
@@ -30,17 +35,27 @@ public class JdbcProofOfWorkRepository extends JdbcHelper implements ProofOfWork
         try (
                 Connection connection = config.getConnection();
                 PreparedStatement ps = connection.prepareStatement("SELECT data, version, nonce_trials_per_byte, " +
-                        "extra_bytes FROM POW WHERE initial_hash=?")
+                        "extra_bytes, expiration_time, message_id FROM POW WHERE initial_hash=?")
         ) {
             ps.setBytes(1, initialHash);
             try (ResultSet rs = ps.executeQuery()) {
                 if (rs.next()) {
                     Blob data = rs.getBlob("data");
-                    return new Item(
-                            Factory.getObjectMessage(rs.getInt("version"), data.getBinaryStream(), (int) data.length()),
-                            rs.getLong("nonce_trials_per_byte"),
-                            rs.getLong("extra_bytes")
-                    );
+                    if (rs.getObject("message_id") == null) {
+                        return new Item(
+                                Factory.getObjectMessage(rs.getInt("version"), data.getBinaryStream(), (int) data.length()),
+                                rs.getLong("nonce_trials_per_byte"),
+                                rs.getLong("extra_bytes")
+                        );
+                    } else {
+                        return new Item(
+                                Factory.getObjectMessage(rs.getInt("version"), data.getBinaryStream(), (int) data.length()),
+                                rs.getLong("nonce_trials_per_byte"),
+                                rs.getLong("extra_bytes"),
+                                rs.getLong("expiration_time"),
+                                ctx.getMessageRepository().getMessage(rs.getLong("message_id"))
+                        );
+                    }
                 } else {
                     throw new IllegalArgumentException("Object requested that we don't have. Initial hash: " + Strings.hex(initialHash));
                 }
@@ -70,24 +85,38 @@ public class JdbcProofOfWorkRepository extends JdbcHelper implements ProofOfWork
     }
 
     @Override
-    public void putObject(ObjectMessage object, long nonceTrialsPerByte, long extraBytes) {
+    public void putObject(Item item) {
         try (
                 Connection connection = config.getConnection();
                 PreparedStatement ps = connection.prepareStatement("INSERT INTO POW (initial_hash, data, version, " +
-                        "nonce_trials_per_byte, extra_bytes) VALUES (?, ?, ?, ?, ?)")
+                        "nonce_trials_per_byte, extra_bytes, expiration_time, message_id) " +
+                        "VALUES (?, ?, ?, ?, ?, ?, ?)")
         ) {
-            ps.setBytes(1, security().getInitialHash(object));
-            writeBlob(ps, 2, object);
-            ps.setLong(3, object.getVersion());
-            ps.setLong(4, nonceTrialsPerByte);
-            ps.setLong(5, extraBytes);
+            ps.setBytes(1, cryptography().getInitialHash(item.object));
+            writeBlob(ps, 2, item.object);
+            ps.setLong(3, item.object.getVersion());
+            ps.setLong(4, item.nonceTrialsPerByte);
+            ps.setLong(5, item.extraBytes);
+
+            if (item.message == null) {
+                ps.setObject(6, null);
+                ps.setObject(7, null);
+            } else {
+                ps.setLong(6, item.expirationTime);
+                ps.setLong(7, (Long) item.message.getId());
+            }
             ps.executeUpdate();
         } catch (IOException | SQLException e) {
-            LOG.debug("Error storing object of type " + object.getPayload().getClass().getSimpleName(), e);
+            LOG.debug("Error storing object of type " + item.object.getPayload().getClass().getSimpleName(), e);
             throw new ApplicationException(e);
         }
     }
 
+    @Override
+    public void putObject(ObjectMessage object, long nonceTrialsPerByte, long extraBytes) {
+        putObject(new Item(object, nonceTrialsPerByte, extraBytes));
+    }
+
     @Override
     public void removeObject(byte[] initialHash) {
         try (
@@ -100,4 +129,9 @@ public class JdbcProofOfWorkRepository extends JdbcHelper implements ProofOfWork
             LOG.debug(e.getMessage(), e);
         }
     }
+
+    @Override
+    public void setContext(InternalContext context) {
+        this.ctx = context;
+    }
 }
diff --git a/repositories/src/main/resources/db/migration/V3.1__Update_table_POW.sql b/repositories/src/main/resources/db/migration/V3.1__Update_table_POW.sql
new file mode 100644
index 0000000..d67a1b5
--- /dev/null
+++ b/repositories/src/main/resources/db/migration/V3.1__Update_table_POW.sql
@@ -0,0 +1,2 @@
+ALTER TABLE POW ADD COLUMN expiration_time BIGINT;
+ALTER TABLE POW ADD COLUMN message_id BIGINT;
diff --git a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcAddressRepositoryTest.java b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcAddressRepositoryTest.java
index 1975d43..7f3098b 100644
--- a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcAddressRepositoryTest.java
+++ b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcAddressRepositoryTest.java
@@ -68,9 +68,11 @@ public class JdbcAddressRepositoryTest extends TestBase {
     public void testFindIdentity() throws Exception {
         BitmessageAddress identity = new BitmessageAddress(IDENTITY_A);
         assertEquals(4, identity.getVersion());
-        assertEquals(identity, repo.findIdentity(identity.getTag()));
         assertNull(repo.findContact(identity.getTag()));
-        assertTrue(identity.has(Pubkey.Feature.DOES_ACK));
+
+        BitmessageAddress storedIdentity = repo.findIdentity(identity.getTag());
+        assertEquals(identity, storedIdentity);
+        assertTrue(storedIdentity.has(Pubkey.Feature.DOES_ACK));
     }
 
     @Test
diff --git a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
index 816eafa..81051de 100644
--- a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
+++ b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
@@ -32,7 +32,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
 
@@ -54,7 +54,7 @@ public class JdbcMessageRepositoryTest extends TestBase {
         AddressRepository addressRepo = new JdbcAddressRepository(config);
         repo = new JdbcMessageRepository(config);
         new InternalContext(new BitmessageContext.Builder()
-                .cryptography(security())
+                .cryptography(cryptography())
                 .addressRepo(addressRepo)
                 .messageRepo(repo)
         );
@@ -146,7 +146,7 @@ public class JdbcMessageRepositoryTest extends TestBase {
     @Test
     public void testSave() throws Exception {
         Plaintext message = new Plaintext.Builder(MSG)
-                .IV(new InventoryVector(security().randomBytes(32)))
+                .IV(new InventoryVector(cryptography().randomBytes(32)))
                 .from(identity)
                 .to(contactA)
                 .message("Subject", "Message")
@@ -169,7 +169,7 @@ public class JdbcMessageRepositoryTest extends TestBase {
     public void testUpdate() throws Exception {
         List<Plaintext> messages = repo.findMessages(Plaintext.Status.DRAFT, contactA);
         Plaintext message = messages.get(0);
-        message.setInventoryVector(new InventoryVector(security().randomBytes(32)));
+        message.setInventoryVector(new InventoryVector(cryptography().randomBytes(32)));
         repo.save(message);
 
         messages = repo.findMessages(Plaintext.Status.DRAFT, contactA);
diff --git a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepositoryTest.java b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepositoryTest.java
index c8fbaf0..4396eb5 100644
--- a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepositoryTest.java
+++ b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepositoryTest.java
@@ -16,13 +16,24 @@
 
 package ch.dissem.bitmessage.repository;
 
+import ch.dissem.bitmessage.BitmessageContext;
+import ch.dissem.bitmessage.InternalContext;
 import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.ObjectMessage;
+import ch.dissem.bitmessage.entity.Plaintext;
+import ch.dissem.bitmessage.entity.payload.GenericPayload;
 import ch.dissem.bitmessage.entity.payload.GetPubkey;
-import ch.dissem.bitmessage.ports.ProofOfWorkRepository;
+import ch.dissem.bitmessage.ports.AddressRepository;
+import ch.dissem.bitmessage.ports.MessageRepository;
+import ch.dissem.bitmessage.ports.ProofOfWorkRepository.Item;
+import ch.dissem.bitmessage.utils.TestUtils;
+import ch.dissem.bitmessage.utils.UnixTime;
 import org.junit.Before;
 import org.junit.Test;
 
+import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
+import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
 import static org.hamcrest.CoreMatchers.*;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
@@ -33,17 +44,51 @@ import static org.junit.Assert.assertTrue;
 public class JdbcProofOfWorkRepositoryTest extends TestBase {
     private TestJdbcConfig config;
     private JdbcProofOfWorkRepository repo;
+    private AddressRepository addressRepo;
+    private MessageRepository messageRepo;
+
+    private byte[] initialHash1;
+    private byte[] initialHash2;
 
     @Before
     public void setUp() throws Exception {
         config = new TestJdbcConfig();
         config.reset();
 
+        addressRepo = new JdbcAddressRepository(config);
+        messageRepo = new JdbcMessageRepository(config);
         repo = new JdbcProofOfWorkRepository(config);
+        InternalContext ctx = new InternalContext(new BitmessageContext.Builder()
+                .addressRepo(addressRepo)
+                .messageRepo(messageRepo)
+                .powRepo(repo)
+                .cryptography(cryptography())
+        );
 
         repo.putObject(new ObjectMessage.Builder()
                         .payload(new GetPubkey(new BitmessageAddress("BM-2DAjcCFrqFrp88FUxExhJ9kPqHdunQmiyn"))).build(),
                 1000, 1000);
+        initialHash1 = repo.getItems().get(0);
+
+        BitmessageAddress sender = TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8");
+        BitmessageAddress recipient = TestUtils.loadContact();
+        addressRepo.save(sender);
+        addressRepo.save(recipient);
+        Plaintext plaintext = new Plaintext.Builder(MSG)
+                .ackData(cryptography().randomBytes(32))
+                .from(sender)
+                .to(recipient)
+                .message("Subject", "Message")
+                .status(Plaintext.Status.DOING_PROOF_OF_WORK)
+                .build();
+        messageRepo.save(plaintext);
+        initialHash2 = cryptography().getInitialHash(plaintext.getAckMessage());
+        repo.putObject(new Item(
+                plaintext.getAckMessage(),
+                1000, 1000,
+                UnixTime.now(+10 * MINUTE),
+                plaintext
+        ));
     }
 
     @Test
@@ -55,16 +100,52 @@ public class JdbcProofOfWorkRepositoryTest extends TestBase {
         assertThat(repo.getItems().size(), is(sizeBefore + 1));
     }
 
+    @Test
+    public void ensureAckObjectsAreStored() throws Exception {
+        int sizeBefore = repo.getItems().size();
+        BitmessageAddress sender = TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8");
+        BitmessageAddress recipient = TestUtils.loadContact();
+        addressRepo.save(sender);
+        addressRepo.save(recipient);
+        Plaintext plaintext = new Plaintext.Builder(MSG)
+                .ackData(cryptography().randomBytes(32))
+                .from(sender)
+                .to(recipient)
+                .message("Subject", "Message")
+                .status(Plaintext.Status.DOING_PROOF_OF_WORK)
+                .build();
+        messageRepo.save(plaintext);
+        repo.putObject(new Item(
+                plaintext.getAckMessage(),
+                1000, 1000,
+                UnixTime.now(+10 * MINUTE),
+                plaintext
+        ));
+        assertThat(repo.getItems().size(), is(sizeBefore + 1));
+    }
+
     @Test
     public void ensureItemCanBeRetrieved() {
-        byte[] initialHash = repo.getItems().get(0);
-        ProofOfWorkRepository.Item item = repo.getItem(initialHash);
+        Item item = repo.getItem(initialHash1);
         assertThat(item, notNullValue());
         assertThat(item.object.getPayload(), instanceOf(GetPubkey.class));
         assertThat(item.nonceTrialsPerByte, is(1000L));
         assertThat(item.extraBytes, is(1000L));
     }
 
+    @Test
+    public void ensureAckItemCanBeRetrieved() {
+        Item item = repo.getItem(initialHash2);
+        assertThat(item, notNullValue());
+        assertThat(item.object.getPayload(), instanceOf(GenericPayload.class));
+        assertThat(item.nonceTrialsPerByte, is(1000L));
+        assertThat(item.extraBytes, is(1000L));
+        assertThat(item.expirationTime, not(0));
+        assertThat(item.message, notNullValue());
+        assertThat(item.message.getFrom().getPrivateKey(), notNullValue());
+        assertThat(item.message.getTo().getPubkey(), notNullValue());
+    }
+
     @Test(expected = RuntimeException.class)
     public void ensureRetrievingNonexistingItemThrowsException() {
         repo.getItem(new byte[0]);
@@ -72,8 +153,8 @@ public class JdbcProofOfWorkRepositoryTest extends TestBase {
 
     @Test
     public void ensureItemCanBeDeleted() {
-        byte[] initialHash = repo.getItems().get(0);
-        repo.removeObject(initialHash);
+        repo.removeObject(initialHash1);
+        repo.removeObject(initialHash2);
         assertTrue(repo.getItems().isEmpty());
     }
 
diff --git a/wif/src/main/java/ch/dissem/bitmessage/wif/WifExporter.java b/wif/src/main/java/ch/dissem/bitmessage/wif/WifExporter.java
index ad6098e..3f4b370 100644
--- a/wif/src/main/java/ch/dissem/bitmessage/wif/WifExporter.java
+++ b/wif/src/main/java/ch/dissem/bitmessage/wif/WifExporter.java
@@ -27,7 +27,7 @@ import java.io.*;
 import java.util.Collection;
 
 import static ch.dissem.bitmessage.entity.valueobject.PrivateKey.PRIVATE_KEY_SIZE;
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 /**
  * @author Christian Basler
@@ -77,7 +77,7 @@ public class WifExporter {
         byte[] result = new byte[37];
         result[0] = (byte) 0x80;
         System.arraycopy(privateKey, 0, result, 1, PRIVATE_KEY_SIZE);
-        byte[] hash = security().doubleSha256(result, PRIVATE_KEY_SIZE + 1);
+        byte[] hash = cryptography().doubleSha256(result, PRIVATE_KEY_SIZE + 1);
         System.arraycopy(hash, 0, result, PRIVATE_KEY_SIZE + 1, 4);
         return Base58.encode(result);
     }
diff --git a/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java b/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java
index 1bd6bcd..f5a8ddc 100644
--- a/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java
+++ b/wif/src/main/java/ch/dissem/bitmessage/wif/WifImporter.java
@@ -31,7 +31,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map.Entry;
 
-import static ch.dissem.bitmessage.utils.Singleton.security;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
 /**
  * @author Christian Basler
@@ -87,7 +87,7 @@ public class WifImporter {
             throw new IOException("Unknown format: " + WIF_SECRET_LENGTH +
                     " bytes expected, but secret " + walletImportFormat + " was " + bytes.length + " long");
 
-        byte[] hash = security().doubleSha256(bytes, 33);
+        byte[] hash = cryptography().doubleSha256(bytes, 33);
         for (int i = 0; i < 4; i++) {
             if (hash[i] != bytes[33 + i]) throw new IOException("Hash check failed for secret " + walletImportFormat);
         }

From 4f0b2cb8f86cfa85495de1099a1051900ba554af Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 6 May 2016 14:13:39 +0200
Subject: [PATCH 37/87] Fixed system test (this time for real)

---
 .../dissem/bitmessage/BitmessageContext.java  |  3 +-
 .../bitmessage/DefaultMessageListener.java    |  3 +-
 .../dissem/bitmessage/ProofOfWorkService.java |  2 -
 .../bitmessage/ports/DefaultLabeler.java      |  2 +-
 .../ports/ProofOfWorkRepository.java          |  1 -
 .../java/ch/dissem/bitmessage/SystemTest.java | 96 ++++++++++++++++++-
 6 files changed, 97 insertions(+), 10 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index d46c36c..23e8eff 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -153,7 +153,6 @@ public class BitmessageContext {
                 .to(to)
                 .message(subject, message)
                 .build();
-        labeler().markAsSending(msg);
         send(msg);
     }
 
@@ -161,7 +160,7 @@ public class BitmessageContext {
         if (msg.getFrom() == null || msg.getFrom().getPrivateKey() == null) {
             throw new IllegalArgumentException("'From' must be an identity, i.e. have a private key.");
         }
-        msg.setStatus(Plaintext.Status.DRAFT);
+        labeler().markAsSending(msg);
         BitmessageAddress to = msg.getTo();
         if (to != null) {
             if (to.getPubkey() == null) {
diff --git a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
index 14c405c..eb27dd9 100644
--- a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
+++ b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
@@ -24,6 +24,7 @@ import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
 import ch.dissem.bitmessage.ports.Labeler;
 import ch.dissem.bitmessage.ports.NetworkHandler;
+import ch.dissem.bitmessage.utils.TTL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -111,7 +112,7 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
         for (Plaintext msg : messages) {
             ctx.getLabeler().markAsSending(msg);
             ctx.getMessageRepository().save(msg);
-            ctx.send(msg, +2 * DAY);
+            ctx.send(msg, TTL.msg());
         }
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
index 6df0cc0..e886c22 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
@@ -1,9 +1,7 @@
 package ch.dissem.bitmessage;
 
 import ch.dissem.bitmessage.entity.*;
-import ch.dissem.bitmessage.entity.payload.Broadcast;
 import ch.dissem.bitmessage.entity.payload.Msg;
-import ch.dissem.bitmessage.entity.payload.ObjectPayload;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.ports.Cryptography;
 import ch.dissem.bitmessage.ports.MessageRepository;
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/DefaultLabeler.java b/core/src/main/java/ch/dissem/bitmessage/ports/DefaultLabeler.java
index 4f21b3e..e4c2105 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/DefaultLabeler.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/DefaultLabeler.java
@@ -43,7 +43,7 @@ public class DefaultLabeler implements Labeler, InternalContext.ContextHolder {
 
     @Override
     public void markAsSending(Plaintext msg) {
-        if (msg.getTo() != null || msg.getTo().getPubkey() == null) {
+        if (msg.getTo() != null && msg.getTo().getPubkey() == null) {
             msg.setStatus(PUBKEY_REQUESTED);
         } else {
             msg.setStatus(DOING_PROOF_OF_WORK);
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkRepository.java b/core/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkRepository.java
index 61dc2ab..b27a05d 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkRepository.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/ProofOfWorkRepository.java
@@ -1,6 +1,5 @@
 package ch.dissem.bitmessage.ports;
 
-import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.Plaintext;
 
diff --git a/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java b/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
index 06b6628..6751819 100644
--- a/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
+++ b/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
@@ -4,13 +4,19 @@ import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.networking.DefaultNetworkHandler;
+import ch.dissem.bitmessage.ports.DefaultLabeler;
 import ch.dissem.bitmessage.repository.*;
 import ch.dissem.bitmessage.utils.TTL;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import static ch.dissem.bitmessage.entity.payload.Pubkey.Feature.DOES_ACK;
 import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
@@ -47,9 +53,10 @@ public class SystemTest {
                 .networkHandler(new DefaultNetworkHandler())
                 .cryptography(new BouncyCryptography())
                 .listener(aliceListener)
+                .labeler(new DebugLabeler("Alice"))
                 .build();
         alice.startup();
-        aliceIdentity = alice.createIdentity(false);
+        aliceIdentity = alice.createIdentity(false, DOES_ACK);
 
         JdbcConfig bobDB = new JdbcConfig("jdbc:h2:mem:bob;DB_CLOSE_DELAY=-1", "sa", "");
         bob = new BitmessageContext.Builder()
@@ -62,9 +69,13 @@ public class SystemTest {
                 .networkHandler(new DefaultNetworkHandler())
                 .cryptography(new BouncyCryptography())
                 .listener(bobListener)
+                .labeler(new DebugLabeler("Bob"))
                 .build();
         bob.startup();
-        bobIdentity = bob.createIdentity(false);
+        bobIdentity = bob.createIdentity(false, DOES_ACK);
+
+        ((DebugLabeler) alice.labeler()).init(aliceIdentity, bobIdentity);
+        ((DebugLabeler) bob.labeler()).init(aliceIdentity, bobIdentity);
     }
 
     @After
@@ -95,4 +106,83 @@ public class SystemTest {
         assertThat(plaintext.getType(), equalTo(Plaintext.Type.BROADCAST));
         assertThat(plaintext.getText(), equalTo(originalMessage));
     }
+
+    private static class DebugLabeler extends DefaultLabeler {
+        private final Logger LOG = LoggerFactory.getLogger("Labeler");
+        final String name;
+        String alice;
+        String bob;
+
+        private DebugLabeler(String name) {
+            this.name = name;
+        }
+
+        private void init(BitmessageAddress alice, BitmessageAddress bob) {
+            this.alice = alice.getAddress();
+            this.bob = bob.getAddress();
+        }
+
+        @Override
+        public void setLabels(Plaintext msg) {
+            LOG.info(name + ": From " + name(msg.getFrom()) + ": Received");
+            super.setLabels(msg);
+        }
+
+        @Override
+        public void markAsDraft(Plaintext msg) {
+            LOG.info(name + ": From " + name(msg.getFrom()) + ": Draft");
+            super.markAsDraft(msg);
+        }
+
+        @Override
+        public void markAsSending(Plaintext msg) {
+            LOG.info(name + ": From " + name(msg.getFrom()) + ": Sending");
+            super.markAsSending(msg);
+        }
+
+        @Override
+        public void markAsSent(Plaintext msg) {
+            LOG.info(name + ": From " + name(msg.getFrom()) + ": Sent");
+            super.markAsSent(msg);
+        }
+
+        @Override
+        public void markAsAcknowledged(Plaintext msg) {
+            LOG.info(name + ": From " + name(msg.getFrom()) + ": Acknowledged");
+            super.markAsAcknowledged(msg);
+        }
+
+        @Override
+        public void markAsRead(Plaintext msg) {
+            LOG.info(name + ": From " + name(msg.getFrom()) + ": Read");
+            super.markAsRead(msg);
+        }
+
+        @Override
+        public void markAsUnread(Plaintext msg) {
+            LOG.info(name + ": From " + name(msg.getFrom()) + ": Unread");
+            super.markAsUnread(msg);
+        }
+
+        @Override
+        public void delete(Plaintext msg) {
+            LOG.info(name + ": From " + name(msg.getFrom()) + ": Cleared");
+            super.delete(msg);
+        }
+
+        @Override
+        public void archive(Plaintext msg) {
+            LOG.info(name + ": From " + name(msg.getFrom()) + ": Archived");
+            super.archive(msg);
+        }
+
+        private String name(BitmessageAddress address) {
+            if (alice.equals(address.getAddress()))
+                return "Alice";
+            else if (bob.equals(address.getAddress()))
+                return "Bob";
+            else
+                return "Unknown (" + address.getAddress() + ")";
+        }
+    }
 }

From de8f04e22acbe5a1ffe77d099c9040e89f15ebdc Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 6 May 2016 17:29:39 +0200
Subject: [PATCH 38/87] Added warning to Labeler for developers who want to
 implement it.

---
 core/src/main/java/ch/dissem/bitmessage/ports/Labeler.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/Labeler.java b/core/src/main/java/ch/dissem/bitmessage/ports/Labeler.java
index 5e52845..e79bee2 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/Labeler.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/Labeler.java
@@ -20,6 +20,8 @@ import ch.dissem.bitmessage.entity.Plaintext;
 
 /**
  * Defines and sets labels. Note that it should also update the status field of a message.
+ * Generally it's highly advised to override the {@link DefaultLabeler} whenever possible,
+ * instead of directly implementing the interface.
  * <p>
  * As the labeler gets called whenever the state of a message changes, it can also be used
  * as a listener.
@@ -35,6 +37,10 @@ public interface Labeler {
 
     void markAsDraft(Plaintext msg);
 
+    /**
+     * It is paramount that this methods marks the {@link Plaintext} object with status
+     * {@link Plaintext.Status#PUBKEY_REQUESTED} (see {@link DefaultLabeler})
+     */
     void markAsSending(Plaintext msg);
 
     void markAsSent(Plaintext msg);

From 05d9ea93d266216933f751b0c8b0f83a076c2599 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 6 May 2016 19:39:39 +0200
Subject: [PATCH 39/87] Acknowledgments are now returned, received, and the
 message (Plaintext object) updated -> no logic to resend messages yet

---
 .../dissem/bitmessage/BitmessageContext.java  | 12 ++-----
 .../bitmessage/DefaultMessageListener.java    | 17 ++++++++--
 .../dissem/bitmessage/ProofOfWorkService.java | 23 +++++++++----
 .../dissem/bitmessage/entity/Plaintext.java   |  3 +-
 .../entity/payload/GenericPayload.java        |  4 +++
 .../dissem/bitmessage/entity/payload/Msg.java |  1 +
 .../ch/dissem/bitmessage/factory/Factory.java |  4 ++-
 .../bitmessage/ports/MessageRepository.java   |  2 ++
 .../java/ch/dissem/bitmessage/SystemTest.java |  9 +++++-
 .../bitmessage/repository/JdbcHelper.java     | 10 ++++++
 .../repository/JdbcMessageRepository.java     | 32 +++++++++----------
 .../migration/V3.2__Update_table_message.sql  |  1 +
 12 files changed, 79 insertions(+), 39 deletions(-)
 create mode 100644 repositories/src/main/resources/db/migration/V3.2__Update_table_message.sql

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 23e8eff..2307958 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -31,8 +31,6 @@ import org.slf4j.LoggerFactory;
 
 import java.net.InetAddress;
 import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -71,16 +69,10 @@ public class BitmessageContext {
     private BitmessageContext(Builder builder) {
         ctx = new InternalContext(builder);
         labeler = builder.labeler;
+        ctx.getProofOfWorkService().doMissingProofOfWork();
+
         networkListener = new DefaultMessageListener(ctx, labeler, builder.listener);
-
         sendPubkeyOnIdentityCreation = builder.sendPubkeyOnIdentityCreation;
-
-        new Timer().schedule(new TimerTask() {
-            @Override
-            public void run() {
-                ctx.getProofOfWorkService().doMissingProofOfWork();
-            }
-        }, 30_000); // After 30 seconds
     }
 
     public AddressRepository addresses() {
diff --git a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
index eb27dd9..05961e4 100644
--- a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
+++ b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
@@ -48,9 +48,12 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
     }
 
     @Override
+    @SuppressWarnings("ConstantConditions")
     public void receive(ObjectMessage object) throws IOException {
         ObjectPayload payload = object.getPayload();
-        if (payload.getType() == null) return;
+        if (payload.getType() == null && payload instanceof GenericPayload) {
+            receive((GenericPayload) payload);
+        }
 
         switch (payload.getType()) {
             case GET_PUBKEY: {
@@ -125,7 +128,7 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
                 if (!object.isSignatureValid(plaintext.getFrom().getPubkey())) {
                     LOG.warn("Msg with IV " + object.getInventoryVector() + " was successfully decrypted, but signature check failed. Ignoring.");
                 } else {
-                    receive(object.getInventoryVector(), msg.getPlaintext());
+                    receive(object.getInventoryVector(), plaintext);
                 }
                 break;
             } catch (DecryptionFailedException ignore) {
@@ -133,6 +136,16 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
         }
     }
 
+    protected void receive(GenericPayload ack) {
+        if (ack.getData().length == Msg.ACK_LENGTH) {
+            Plaintext msg = ctx.getMessageRepository().getMessageForAck(ack.getData());
+            if (msg != null) {
+                ctx.getLabeler().markAsAcknowledged(msg);
+                ctx.getMessageRepository().save(msg);
+            }
+        }
+    }
+
     protected void receive(ObjectMessage object, Broadcast broadcast) throws IOException {
         byte[] tag = broadcast instanceof V5Broadcast ? ((V5Broadcast) broadcast).getTag() : null;
         for (BitmessageAddress subscription : ctx.getAddressRepository().getSubscriptions(broadcast.getVersion())) {
diff --git a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
index e886c22..d242b79 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
@@ -12,6 +12,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import static ch.dissem.bitmessage.InternalContext.NETWORK_EXTRA_BYTES;
 import static ch.dissem.bitmessage.InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE;
@@ -29,14 +31,21 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
     private MessageRepository messageRepo;
 
     public void doMissingProofOfWork() {
-        List<byte[]> items = powRepo.getItems();
+        final List<byte[]> items = powRepo.getItems();
         if (items.isEmpty()) return;
 
-        LOG.info("Doing POW for " + items.size() + " tasks.");
-        for (byte[] initialHash : items) {
-            Item item = powRepo.getItem(initialHash);
-            cryptography.doProofOfWork(item.object, item.nonceTrialsPerByte, item.extraBytes, this);
-        }
+        // Wait for 30 seconds, to let the application start up before putting heavy load on the CPU
+        new Timer().schedule(new TimerTask() {
+            @Override
+            public void run() {
+                LOG.info("Doing POW for " + items.size() + " tasks.");
+                for (byte[] initialHash : items) {
+                    Item item = powRepo.getItem(initialHash);
+                    cryptography.doProofOfWork(item.object, item.nonceTrialsPerByte, item.extraBytes,
+                            ProofOfWorkService.this);
+                }
+            }
+        }, 30_000);
     }
 
     public void doProofOfWork(ObjectMessage object) {
@@ -79,7 +88,6 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
                 messageRepo.save(plaintext);
             }
             ctx.getInventory().storeObject(object);
-            powRepo.removeObject(initialHash);
             ctx.getNetworkHandler().offer(object.getInventoryVector());
         } else {
             item.message.getAckMessage().setNonce(nonce);
@@ -96,6 +104,7 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
             }
             doProofOfWork(item.message.getTo(), object);
         }
+        powRepo.removeObject(initialHash);
     }
 
     @Override
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
index a2b66f7..b90bf14 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
@@ -16,6 +16,7 @@
 
 package ch.dissem.bitmessage.entity;
 
+import ch.dissem.bitmessage.entity.payload.Msg;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.Label;
@@ -511,7 +512,7 @@ public class Plaintext implements Streamable {
                 to = new BitmessageAddress(0, 0, destinationRipe);
             }
             if (type == Type.MSG && ackMessage == null && ackData == null) {
-                ackData = cryptography().randomBytes(32);
+                ackData = cryptography().randomBytes(Msg.ACK_LENGTH);
             }
             return new Plaintext(this);
         }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
index 4ae4696..176d938 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
@@ -53,6 +53,10 @@ public class GenericPayload extends ObjectPayload {
         return stream;
     }
 
+    public byte[] getData() {
+        return data;
+    }
+
     @Override
     public void write(OutputStream stream) throws IOException {
         stream.write(data);
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
index edc4643..64a010c 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
@@ -33,6 +33,7 @@ import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
  */
 public class Msg extends ObjectPayload implements Encrypted, PlaintextHolder {
     private static final long serialVersionUID = 4327495048296365733L;
+    public static final int ACK_LENGTH = 32;
 
     private long stream;
     private CryptoBox encrypted;
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
index 49db9d6..53e1676 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
@@ -23,6 +23,8 @@ import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.payload.*;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
 import ch.dissem.bitmessage.exception.NodeException;
+import ch.dissem.bitmessage.utils.TTL;
+import ch.dissem.bitmessage.utils.UnixTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -210,6 +212,6 @@ public class Factory {
         if (plaintext == null || plaintext.getAckData() == null)
             return null;
         GenericPayload ack = new GenericPayload(3, plaintext.getFrom().getStream(), plaintext.getAckData());
-        return new ObjectMessage.Builder().objectType(MSG).payload(ack).build();
+        return new ObjectMessage.Builder().objectType(MSG).payload(ack).expiresTime(UnixTime.now(+TTL.msg())).build();
     }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java b/core/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java
index c4cff5c..0c46499 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java
@@ -34,6 +34,8 @@ public interface MessageRepository {
 
     Plaintext getMessage(byte[] initialHash);
 
+    Plaintext getMessageForAck(byte[] ackData);
+
     List<Plaintext> findMessages(Label label);
 
     List<Plaintext> findMessages(Status status);
diff --git a/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java b/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
index 6751819..03cbf5e 100644
--- a/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
+++ b/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
@@ -5,11 +5,13 @@ import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.networking.DefaultNetworkHandler;
 import ch.dissem.bitmessage.ports.DefaultLabeler;
+import ch.dissem.bitmessage.ports.Labeler;
 import ch.dissem.bitmessage.repository.*;
 import ch.dissem.bitmessage.utils.TTL;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -20,6 +22,7 @@ import static ch.dissem.bitmessage.entity.payload.Pubkey.Feature.DOES_ACK;
 import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
+import static org.mockito.Matchers.any;
 
 /**
  * @author Christian Basler
@@ -29,6 +32,7 @@ public class SystemTest {
 
     private BitmessageContext alice;
     private TestListener aliceListener = new TestListener();
+    private Labeler aliceLabeler = Mockito.spy(new DebugLabeler("Alice"));
     private BitmessageAddress aliceIdentity;
 
     private BitmessageContext bob;
@@ -53,7 +57,7 @@ public class SystemTest {
                 .networkHandler(new DefaultNetworkHandler())
                 .cryptography(new BouncyCryptography())
                 .listener(aliceListener)
-                .labeler(new DebugLabeler("Alice"))
+                .labeler(aliceLabeler)
                 .build();
         alice.startup();
         aliceIdentity = alice.createIdentity(false, DOES_ACK);
@@ -93,6 +97,9 @@ public class SystemTest {
 
         assertThat(plaintext.getType(), equalTo(Plaintext.Type.MSG));
         assertThat(plaintext.getText(), equalTo(originalMessage));
+
+        Mockito.verify(aliceLabeler, Mockito.timeout(TimeUnit.MINUTES.toMillis(15)).atLeastOnce())
+                .markAsAcknowledged(any());
     }
 
     @Test
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcHelper.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcHelper.java
index 1df12f6..beb4c80 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcHelper.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcHelper.java
@@ -18,6 +18,7 @@ package ch.dissem.bitmessage.repository;
 
 import ch.dissem.bitmessage.entity.Streamable;
 import ch.dissem.bitmessage.entity.payload.ObjectType;
+import ch.dissem.bitmessage.exception.ApplicationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -25,6 +26,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
+import java.util.Collection;
 
 import static ch.dissem.bitmessage.utils.Strings.hex;
 
@@ -85,4 +87,12 @@ public abstract class JdbcHelper {
             ps.setBytes(parameterIndex, os.toByteArray());
         }
     }
+
+    protected <T> T single(Collection<T> collection) {
+        if (collection.size() > 1) {
+            throw new ApplicationException("This shouldn't happen, found " + collection.size() +
+                    " messages, one or none was expected");
+        }
+        return collection.stream().findAny().orElse(null);
+    }
 }
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
index ae1b496..ffc639f 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
@@ -137,16 +137,12 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
 
     @Override
     public Plaintext getMessage(byte[] initialHash) {
-        List<Plaintext> plaintexts = find("initial_hash=X'" + Strings.hex(initialHash) + "'");
-        switch (plaintexts.size()) {
-            case 0:
-                return null;
-            case 1:
-                return plaintexts.get(0);
-            default:
-                throw new ApplicationException("This shouldn't happen, found " + plaintexts.size() +
-                        " messages, one or none was expected");
-        }
+        return single(find("initial_hash=X'" + Strings.hex(initialHash) + "'"));
+    }
+
+    @Override
+    public Plaintext getMessageForAck(byte[] ackData) {
+        return single(find("ack_data=X'" + Strings.hex(ackData) + "' AND status='" + Plaintext.Status.SENT + "'"));
     }
 
     @Override
@@ -174,7 +170,7 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
         try (
                 Connection connection = config.getConnection();
                 Statement stmt = connection.createStatement();
-                ResultSet rs = stmt.executeQuery("SELECT id, iv, type, sender, recipient, data, sent, received, status " +
+                ResultSet rs = stmt.executeQuery("SELECT id, iv, type, sender, recipient, data, ack_data, sent, received, status " +
                         "FROM Message WHERE " + where)
         ) {
             while (rs.next()) {
@@ -187,6 +183,7 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
                 builder.IV(new InventoryVector(iv));
                 builder.from(ctx.getAddressRepository().getAddress(rs.getString("sender")));
                 builder.to(ctx.getAddressRepository().getAddress(rs.getString("recipient")));
+                builder.ackData(rs.getBytes("ack_data"));
                 builder.sent(rs.getLong("sent"));
                 builder.received(rs.getLong("received"));
                 builder.status(Plaintext.Status.valueOf(rs.getString("status")));
@@ -268,8 +265,8 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
 
     private void insert(Connection connection, Plaintext message) throws SQLException, IOException {
         try (PreparedStatement ps = connection.prepareStatement(
-                "INSERT INTO Message (iv, type, sender, recipient, data, sent, received, status, initial_hash) " +
-                        "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)",
+                "INSERT INTO Message (iv, type, sender, recipient, data, ack_data, sent, received, status, initial_hash) " +
+                        "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                 Statement.RETURN_GENERATED_KEYS)
         ) {
             ps.setBytes(1, message.getInventoryVector() == null ? null : message.getInventoryVector().getHash());
@@ -277,10 +274,11 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
             ps.setString(3, message.getFrom().getAddress());
             ps.setString(4, message.getTo() == null ? null : message.getTo().getAddress());
             writeBlob(ps, 5, message);
-            ps.setLong(6, message.getSent());
-            ps.setLong(7, message.getReceived());
-            ps.setString(8, message.getStatus() == null ? null : message.getStatus().name());
-            ps.setBytes(9, message.getInitialHash());
+            ps.setBytes(6, message.getAckData());
+            ps.setLong(7, message.getSent());
+            ps.setLong(8, message.getReceived());
+            ps.setString(9, message.getStatus() == null ? null : message.getStatus().name());
+            ps.setBytes(10, message.getInitialHash());
 
             ps.executeUpdate();
             // get generated id
diff --git a/repositories/src/main/resources/db/migration/V3.2__Update_table_message.sql b/repositories/src/main/resources/db/migration/V3.2__Update_table_message.sql
new file mode 100644
index 0000000..8b43b0a
--- /dev/null
+++ b/repositories/src/main/resources/db/migration/V3.2__Update_table_message.sql
@@ -0,0 +1 @@
+ALTER TABLE Message ADD COLUMN ack_data BINARY(32);

From a67ac27921fa89545109d61e42e42a27af7ea62b Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Tue, 10 May 2016 07:26:25 +0200
Subject: [PATCH 40/87] Fixed yet another test

---
 .../src/main/java/ch/dissem/bitmessage/BitmessageContext.java | 2 +-
 .../main/java/ch/dissem/bitmessage/ProofOfWorkService.java    | 4 ++--
 .../java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 2307958..aef6a67 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -69,7 +69,7 @@ public class BitmessageContext {
     private BitmessageContext(Builder builder) {
         ctx = new InternalContext(builder);
         labeler = builder.labeler;
-        ctx.getProofOfWorkService().doMissingProofOfWork();
+        ctx.getProofOfWorkService().doMissingProofOfWork(30_000); // TODO: this should be configurable
 
         networkListener = new DefaultMessageListener(ctx, labeler, builder.listener);
         sendPubkeyOnIdentityCreation = builder.sendPubkeyOnIdentityCreation;
diff --git a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
index d242b79..04016b5 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
@@ -30,7 +30,7 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
     private ProofOfWorkRepository powRepo;
     private MessageRepository messageRepo;
 
-    public void doMissingProofOfWork() {
+    public void doMissingProofOfWork(long delayInMilliseconds) {
         final List<byte[]> items = powRepo.getItems();
         if (items.isEmpty()) return;
 
@@ -45,7 +45,7 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
                             ProofOfWorkService.this);
                 }
             }
-        }, 30_000);
+        }, delayInMilliseconds);
     }
 
     public void doProofOfWork(ObjectMessage object) {
diff --git a/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java b/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
index fa58cfe..c4529e3 100644
--- a/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
@@ -77,9 +77,9 @@ public class ProofOfWorkServiceTest {
         when(proofOfWorkRepo.getItem(any(byte[].class))).thenReturn(new ProofOfWorkRepository.Item(null, 1001, 1002));
         doNothing().when(cryptography).doProofOfWork(any(ObjectMessage.class), anyLong(), anyLong(), any(ProofOfWorkEngine.Callback.class));
 
-        proofOfWorkService.doMissingProofOfWork();
+        proofOfWorkService.doMissingProofOfWork(10);
 
-        verify(cryptography).doProofOfWork((ObjectMessage) isNull(), eq(1001L), eq(1002L),
+        verify(cryptography, timeout(1000)).doProofOfWork((ObjectMessage) isNull(), eq(1001L), eq(1002L),
                 any(ProofOfWorkEngine.Callback.class));
     }
 

From e44dd967d0230f3509b8c8ee0e65e210bc6b2246 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 13 May 2016 12:24:16 +0200
Subject: [PATCH 41/87] Test for NodeRegistry

---
 core/build.gradle                             |  1 +
 .../bitmessage/ports/MemoryNodeRegistry.java  | 14 +--
 .../bitmessage/ports/NodeRegistryTest.java    | 95 +++++++++++++++++++
 3 files changed, 101 insertions(+), 9 deletions(-)
 create mode 100644 core/src/test/java/ch/dissem/bitmessage/ports/NodeRegistryTest.java

diff --git a/core/build.gradle b/core/build.gradle
index 8754cb3..dd100e6 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -26,6 +26,7 @@ artifacts {
 dependencies {
     compile 'org.slf4j:slf4j-api:1.7.12'
     testCompile 'junit:junit:4.11'
+    testCompile 'org.hamcrest:hamcrest-library:1.3'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile project(':cryptography-bc')
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java b/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
index c68a474..ff2ad95 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
@@ -46,15 +46,11 @@ public class MemoryNodeRegistry implements NodeRegistry {
             while (scanner.hasNext()) {
                 try {
                     String line = scanner.nextLine().trim();
-                    if (line.startsWith("#") || line.isEmpty()) {
-                        // Ignore
-                        continue;
-                    }
                     if (line.startsWith("[stream")) {
                         stream = Long.parseLong(line.substring(8, line.lastIndexOf(']')));
                         streamSet = new HashSet<>();
                         stableNodes.put(stream, streamSet);
-                    } else if (streamSet != null) {
+                    } else if (streamSet != null && !line.isEmpty() && !line.startsWith("#")) {
                         int portIndex = line.lastIndexOf(':');
                         InetAddress[] inetAddresses = InetAddress.getAllByName(line.substring(0, portIndex));
                         int port = Integer.valueOf(line.substring(portIndex + 1));
@@ -89,12 +85,12 @@ public class MemoryNodeRegistry implements NodeRegistry {
                         known.remove(node);
                     }
                 }
-            } else {
-                Set<NetworkAddress> nodes = stableNodes.get(stream);
-                if (nodes == null || nodes.isEmpty()) {
+            }
+            if (result.isEmpty()) {
+                if (stableNodes.isEmpty()) {
                     loadStableNodes();
-                    nodes = stableNodes.get(stream);
                 }
+                Set<NetworkAddress> nodes = stableNodes.get(stream);
                 if (nodes != null && !nodes.isEmpty()) {
                     // To reduce load on stable nodes, only return one
                     result.add(selectRandom(nodes));
diff --git a/core/src/test/java/ch/dissem/bitmessage/ports/NodeRegistryTest.java b/core/src/test/java/ch/dissem/bitmessage/ports/NodeRegistryTest.java
new file mode 100644
index 0000000..0e54446
--- /dev/null
+++ b/core/src/test/java/ch/dissem/bitmessage/ports/NodeRegistryTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.ports;
+
+import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
+import ch.dissem.bitmessage.utils.UnixTime;
+import org.junit.Test;
+
+import java.util.Arrays;
+
+import static ch.dissem.bitmessage.utils.UnixTime.HOUR;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertThat;
+
+public class NodeRegistryTest {
+    private NodeRegistry registry = new MemoryNodeRegistry();
+
+    @Test
+    public void ensureGetKnownNodesWithoutStreamsYieldsEmpty() {
+        assertThat(registry.getKnownAddresses(10), empty());
+    }
+
+    @Test
+    public void ensureGetKnownNodesForStream1YieldsResult() {
+        assertThat(registry.getKnownAddresses(10, 1), hasSize(1));
+    }
+
+    @Test
+    public void ensureNodeIsStored() {
+        registry.offerAddresses(Arrays.asList(
+                new NetworkAddress.Builder()
+                        .ipv4(127, 0, 0, 1)
+                        .port(42)
+                        .stream(1)
+                        .time(UnixTime.now())
+                        .build(),
+                new NetworkAddress.Builder()
+                        .ipv4(127, 0, 0, 2)
+                        .port(42)
+                        .stream(1)
+                        .time(UnixTime.now())
+                        .build(),
+                new NetworkAddress.Builder()
+                        .ipv4(127, 0, 0, 2)
+                        .port(42)
+                        .stream(2)
+                        .time(UnixTime.now())
+                        .build()
+        ));
+        assertThat(registry.getKnownAddresses(10, 1).size(), is(2));
+        assertThat(registry.getKnownAddresses(10, 2).size(), is(1));
+        assertThat(registry.getKnownAddresses(10, 1, 2).size(), is(3));
+    }
+
+    @Test
+    public void ensureOldNodesAreRemoved() {
+        registry.offerAddresses(Arrays.asList(
+                new NetworkAddress.Builder()
+                        .ipv4(127, 0, 0, 1)
+                        .port(42)
+                        .stream(1)
+                        .time(UnixTime.now())
+                        .build(),
+                new NetworkAddress.Builder()
+                        .ipv4(127, 0, 0, 2)
+                        .port(42)
+                        .stream(1)
+                        .time(UnixTime.now(-4 * HOUR))
+                        .build(),
+                new NetworkAddress.Builder()
+                        .ipv4(127, 0, 0, 2)
+                        .port(42)
+                        .stream(2)
+                        .time(UnixTime.now())
+                        .build()
+        ));
+        assertThat(registry.getKnownAddresses(10, 1).size(), is(1));
+        assertThat(registry.getKnownAddresses(10, 2).size(), is(1));
+        assertThat(registry.getKnownAddresses(10, 1, 2).size(), is(2));
+    }
+}

From 43f42dd400a2af4ca6b15f8065c8bdc57b7c3ca9 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 20 May 2016 07:32:41 +0200
Subject: [PATCH 42/87] This breaks a lot of things, but it seems necessary.
 Implemented the resending mechanism and fixed many problems on the way, but
 tests and triggers are still to do.

---
 .../dissem/bitmessage/BitmessageContext.java  |  4 +-
 .../bitmessage/DefaultMessageListener.java    |  9 ++-
 .../ch/dissem/bitmessage/InternalContext.java | 16 +++-
 .../dissem/bitmessage/ProofOfWorkService.java |  2 +
 .../dissem/bitmessage/entity/Plaintext.java   | 74 ++++++++++++++++---
 .../ch/dissem/bitmessage/entity/Version.java  |  4 +-
 .../ch/dissem/bitmessage/factory/Factory.java |  2 +-
 .../bitmessage/ports/MessageRepository.java   |  2 +
 .../bitmessage/entity/SerializationTest.java  | 28 ++++++-
 .../bitmessage/ports/NodeRegistryTest.java    |  4 +
 .../bitmessage/networking/Connection.java     | 19 +++--
 .../networking/ConnectionOrganizer.java       |  7 +-
 .../networking/DefaultNetworkHandler.java     |  5 +-
 .../bitmessage/networking/ServerRunnable.java |  7 +-
 .../repository/JdbcMessageRepository.java     | 50 ++++++++++---
 .../migration/V3.2__Update_table_message.sql  |  3 +
 .../repository/JdbcMessageRepositoryTest.java | 18 ++++-
 17 files changed, 202 insertions(+), 52 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index aef6a67..ad21e72 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -167,13 +167,13 @@ public class BitmessageContext {
             LOG.info("Sending message.");
             ctx.getMessageRepository().save(msg);
             if (msg.getType() == MSG) {
-                ctx.send(msg, TTL.msg());
+                ctx.send(msg);
             } else {
                 ctx.send(
                         msg.getFrom(),
                         to,
                         Factory.getBroadcast(msg),
-                        TTL.msg()
+                        msg.getTTL()
                 );
             }
         }
diff --git a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
index 05961e4..b5d70d1 100644
--- a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
+++ b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
@@ -51,8 +51,11 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
     @SuppressWarnings("ConstantConditions")
     public void receive(ObjectMessage object) throws IOException {
         ObjectPayload payload = object.getPayload();
-        if (payload.getType() == null && payload instanceof GenericPayload) {
-            receive((GenericPayload) payload);
+        if (payload.getType() == null) {
+            if (payload instanceof GenericPayload) {
+                receive((GenericPayload) payload);
+            }
+            return;
         }
 
         switch (payload.getType()) {
@@ -115,7 +118,7 @@ class DefaultMessageListener implements NetworkHandler.MessageListener {
         for (Plaintext msg : messages) {
             ctx.getLabeler().markAsSending(msg);
             ctx.getMessageRepository().save(msg);
-            ctx.send(msg, TTL.msg());
+            ctx.send(msg);
         }
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
index 884dd16..057bfef 100644
--- a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.List;
 import java.util.TreeSet;
 
 /**
@@ -160,12 +161,13 @@ public class InternalContext {
         return port;
     }
 
-    public void send(final Plaintext plaintext, final long timeToLive) {
+    public void send(final Plaintext plaintext) {
         if (plaintext.getAckMessage() != null) {
-            long expires = UnixTime.now(+timeToLive);
+            long expires = UnixTime.now(+plaintext.getTTL());
+            LOG.info("Expires at " + expires);
             proofOfWorkService.doProofOfWorkWithAck(plaintext, expires);
         } else {
-            send(plaintext.getFrom(), plaintext.getTo(), new Msg(plaintext), timeToLive);
+            send(plaintext.getFrom(), plaintext.getTo(), new Msg(plaintext), plaintext.getTTL());
         }
     }
 
@@ -278,6 +280,14 @@ public class InternalContext {
         }
     }
 
+    public void resendUnacknowledged() {
+        List<Plaintext> messages = messageRepository.findMessagesToResend();
+        for (Plaintext message : messages) {
+            send(message);
+            messageRepository.save(message);
+        }
+    }
+
     public long getClientNonce() {
         return clientNonce;
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
index 04016b5..e9a27db 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
@@ -69,6 +69,7 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
 
     public void doProofOfWorkWithAck(Plaintext plaintext, long expirationTime) {
         final ObjectMessage ack = plaintext.getAckMessage();
+        messageRepo.save(plaintext);
         Item item = new Item(ack, NETWORK_NONCE_TRIALS_PER_BYTE, NETWORK_EXTRA_BYTES,
                 expirationTime, plaintext);
         powRepo.putObject(item);
@@ -84,6 +85,7 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
             Plaintext plaintext = messageRepo.getMessage(initialHash);
             if (plaintext != null) {
                 plaintext.setInventoryVector(object.getInventoryVector());
+                plaintext.updateNextTry();
                 ctx.getLabeler().markAsSent(plaintext);
                 messageRepo.save(plaintext);
             }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
index b90bf14..90c3c50 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
@@ -17,13 +17,14 @@
 package ch.dissem.bitmessage.entity;
 
 import ch.dissem.bitmessage.entity.payload.Msg;
-import ch.dissem.bitmessage.entity.payload.Pubkey;
+import ch.dissem.bitmessage.entity.payload.Pubkey.Feature;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.utils.Decode;
 import ch.dissem.bitmessage.utils.Encode;
+import ch.dissem.bitmessage.utils.TTL;
 import ch.dissem.bitmessage.utils.UnixTime;
 
 import java.io.*;
@@ -54,6 +55,10 @@ public class Plaintext implements Streamable {
     private Set<Label> labels;
     private byte[] initialHash;
 
+    private long ttl;
+    private int retries;
+    private Long nextTry;
+
     private Plaintext(Builder builder) {
         id = builder.id;
         inventoryVector = builder.inventoryVector;
@@ -74,6 +79,9 @@ public class Plaintext implements Streamable {
         sent = builder.sent;
         received = builder.received;
         labels = builder.labels;
+        ttl = builder.ttl;
+        retries = builder.retries;
+        nextTry = builder.nextTry;
     }
 
     public static Plaintext read(Type type, InputStream in) throws IOException {
@@ -96,7 +104,7 @@ public class Plaintext implements Streamable {
                 .destinationRipe(type == Type.MSG ? Decode.bytes(in, 20) : null)
                 .encoding(Decode.varInt(in))
                 .message(Decode.varBytes(in))
-                .ack(type == Type.MSG ? Decode.varBytes(in) : null);
+                .ackMessage(type == Type.MSG ? Decode.varBytes(in) : null);
     }
 
     public InventoryVector getInventoryVector() {
@@ -174,12 +182,10 @@ public class Plaintext implements Streamable {
         Encode.varInt(message.length, out);
         out.write(message);
         if (type == Type.MSG) {
-            if (to.has(Pubkey.Feature.DOES_ACK) && getAckMessage() != null) {
+            if (to.has(Feature.DOES_ACK) && getAckMessage() != null) {
                 ByteArrayOutputStream ack = new ByteArrayOutputStream();
                 getAckMessage().write(ack);
-                byte[] data = ack.toByteArray();
-                Encode.varInt(data.length, out);
-                out.write(data);
+                Encode.varBytes(ack.toByteArray(), out);
             } else {
                 Encode.varInt(0, out);
             }
@@ -224,6 +230,30 @@ public class Plaintext implements Streamable {
         this.status = status;
     }
 
+    public long getTTL() {
+        return ttl;
+    }
+
+    public int getRetries() {
+        return retries;
+    }
+
+    public Long getNextTry() {
+        return nextTry;
+    }
+
+    public void updateNextTry() {
+        if (nextTry == null) {
+            if (sent != null && to.has(Feature.DOES_ACK)) {
+                nextTry = sent + ttl;
+                retries++;
+            }
+        } else {
+            nextTry = nextTry + (1 << retries) * ttl;
+            retries++;
+        }
+    }
+
     public String getSubject() {
         Scanner s = new Scanner(new ByteArrayInputStream(message), "UTF-8");
         String firstLine = s.nextLine();
@@ -272,9 +302,7 @@ public class Plaintext implements Streamable {
 
     public void addLabels(Label... labels) {
         if (labels != null) {
-            for (Label label : labels) {
-                this.labels.add(label);
-            }
+            Collections.addAll(this.labels, labels);
         }
     }
 
@@ -366,6 +394,9 @@ public class Plaintext implements Streamable {
         private long received;
         private Status status;
         private Set<Label> labels = new HashSet<>();
+        private long ttl;
+        private int retries;
+        private Long nextTry;
 
         public Builder(Type type) {
             this.type = type;
@@ -459,14 +490,15 @@ public class Plaintext implements Streamable {
             return this;
         }
 
-        public Builder ack(byte[] ack) {
-            if (type != Type.MSG && ack != null) throw new IllegalArgumentException("ack only allowed for msg");
+        public Builder ackMessage(byte[] ack) {
+            if (type != Type.MSG && ack != null) throw new IllegalArgumentException("ackMessage only allowed for msg");
             this.ackMessage = ack;
             return this;
         }
 
         public Builder ackData(byte[] ackData) {
-            if (type != Type.MSG && ackData != null) throw new IllegalArgumentException("ack only allowed for msg");
+            if (type != Type.MSG && ackData != null)
+                throw new IllegalArgumentException("ackMessage only allowed for msg");
             this.ackData = ackData;
             return this;
         }
@@ -496,6 +528,21 @@ public class Plaintext implements Streamable {
             return this;
         }
 
+        public Builder ttl(long ttl) {
+            this.ttl = ttl;
+            return this;
+        }
+
+        public Builder retries(int retries) {
+            this.retries = retries;
+            return this;
+        }
+
+        public Builder nextTry(Long nextTry) {
+            this.nextTry = nextTry;
+            return this;
+        }
+
         public Plaintext build() {
             if (from == null) {
                 from = new BitmessageAddress(Factory.createPubkey(
@@ -514,6 +561,9 @@ public class Plaintext implements Streamable {
             if (type == Type.MSG && ackMessage == null && ackData == null) {
                 ackData = cryptography().randomBytes(Msg.ACK_LENGTH);
             }
+            if (ttl <= 0) {
+                ttl = TTL.msg();
+            }
             return new Plaintext(this);
         }
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Version.java b/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
index 3722528..8539be1 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
@@ -145,13 +145,13 @@ public class Version implements MessagePayload {
         private String userAgent;
         private long[] streamNumbers;
 
-        public Builder defaults() {
+        public Builder defaults(long clientNonce) {
             version = BitmessageContext.CURRENT_VERSION;
             services = 1;
             timestamp = UnixTime.now();
-            nonce = new Random().nextInt();
             userAgent = "/Jabit:0.0.1/";
             streamNumbers = new long[]{1};
+            nonce = clientNonce;
             return this;
         }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
index 53e1676..0597f6a 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
@@ -212,6 +212,6 @@ public class Factory {
         if (plaintext == null || plaintext.getAckData() == null)
             return null;
         GenericPayload ack = new GenericPayload(3, plaintext.getFrom().getStream(), plaintext.getAckData());
-        return new ObjectMessage.Builder().objectType(MSG).payload(ack).expiresTime(UnixTime.now(+TTL.msg())).build();
+        return new ObjectMessage.Builder().objectType(MSG).payload(ack).expiresTime(UnixTime.now(plaintext.getTTL())).build();
     }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java b/core/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java
index 0c46499..aca16b9 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/MessageRepository.java
@@ -44,6 +44,8 @@ public interface MessageRepository {
 
     List<Plaintext> findMessages(BitmessageAddress sender);
 
+    List<Plaintext> findMessagesToResend();
+
     void save(Plaintext message);
 
     void remove(Plaintext message);
diff --git a/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java b/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
index 26d8a35..5405f23 100644
--- a/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/entity/SerializationTest.java
@@ -82,7 +82,7 @@ public class SerializationTest extends TestBase {
                 .from(TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8"))
                 .to(TestUtils.loadContact())
                 .message("Subject", "Message")
-                .ackData("ack".getBytes())
+                .ackData("ackMessage".getBytes())
                 .signature(new byte[0])
                 .build();
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -98,6 +98,32 @@ public class SerializationTest extends TestBase {
         assertEquals(p1, p2);
     }
 
+    @Test
+    public void ensurePlaintextWithAckMessageIsSerializedAndDeserializedCorrectly() throws Exception {
+        Plaintext p1 = new Plaintext.Builder(MSG)
+                .from(TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8"))
+                .to(TestUtils.loadContact())
+                .message("Subject", "Message")
+                .ackData("ackMessage".getBytes())
+                .signature(new byte[0])
+                .build();
+        ObjectMessage ackMessage1 = p1.getAckMessage();
+        assertNotNull(ackMessage1);
+
+        ByteArrayOutputStream out = new ByteArrayOutputStream();
+        p1.write(out);
+        ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+        Plaintext p2 = Plaintext.read(MSG, in);
+
+        // Received is automatically set on deserialization, so we'll need to set it to 0
+        Field received = Plaintext.class.getDeclaredField("received");
+        received.setAccessible(true);
+        received.set(p2, 0L);
+
+        assertEquals(p1, p2);
+        assertEquals(ackMessage1, p2.getAckMessage());
+    }
+
     @Test
     public void ensureNetworkMessageIsSerializedAndDeserializedCorrectly() throws Exception {
         ArrayList<InventoryVector> ivs = new ArrayList<>(50000);
diff --git a/core/src/test/java/ch/dissem/bitmessage/ports/NodeRegistryTest.java b/core/src/test/java/ch/dissem/bitmessage/ports/NodeRegistryTest.java
index 0e54446..993e3a9 100644
--- a/core/src/test/java/ch/dissem/bitmessage/ports/NodeRegistryTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/ports/NodeRegistryTest.java
@@ -34,6 +34,10 @@ public class NodeRegistryTest {
         assertThat(registry.getKnownAddresses(10), empty());
     }
 
+    /**
+     * Please note that this test fails if there is no internet connection,
+     * as the initial nodes' IP addresses are determined by DNS lookup.
+     */
     @Test
     public void ensureGetKnownNodesForStream1YieldsResult() {
         assertThat(registry.getKnownAddresses(10, 1), hasSize(1));
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
index 4717675..9ed19bc 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
@@ -72,6 +72,7 @@ class Connection {
     private final ReaderRunnable reader = new ReaderRunnable();
     private final WriterRunnable writer = new WriterRunnable();
     private final DefaultNetworkHandler networkHandler;
+    private final long clientNonce;
 
     private volatile State state;
     private InputStream in;
@@ -83,22 +84,23 @@ class Connection {
     private long lastObjectTime;
 
     public Connection(InternalContext context, Mode mode, Socket socket, MessageListener listener,
-                      Set<InventoryVector> requestedObjectsMap) throws IOException {
+                      Set<InventoryVector> requestedObjectsMap, long clientNonce) throws IOException {
         this(context, mode, listener, socket, requestedObjectsMap,
                 Collections.newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(10_000)),
                 new NetworkAddress.Builder().ip(socket.getInetAddress()).port(socket.getPort()).stream(1).build(),
-                0);
+                0, clientNonce);
     }
 
     public Connection(InternalContext context, Mode mode, NetworkAddress node, MessageListener listener,
-                      Set<InventoryVector> requestedObjectsMap) {
+                      Set<InventoryVector> requestedObjectsMap, long clientNonce) {
         this(context, mode, listener, new Socket(), requestedObjectsMap,
                 Collections.newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(10_000)),
-                node, 0);
+                node, 0, clientNonce);
     }
 
     private Connection(InternalContext context, Mode mode, MessageListener listener, Socket socket,
-                       Set<InventoryVector> commonRequestedObjects, Set<InventoryVector> requestedObjects, NetworkAddress node, long syncTimeout) {
+                       Set<InventoryVector> commonRequestedObjects, Set<InventoryVector> requestedObjects,
+                       NetworkAddress node, long syncTimeout, long clientNonce) {
         this.startTime = UnixTime.now();
         this.ctx = context;
         this.mode = mode;
@@ -112,6 +114,7 @@ class Connection {
         this.syncTimeout = (syncTimeout > 0 ? UnixTime.now(+syncTimeout) : 0);
         this.ivCache = new ConcurrentHashMap<>();
         this.networkHandler = (DefaultNetworkHandler) ctx.getNetworkHandler();
+        this.clientNonce = clientNonce;
     }
 
     public static Connection sync(InternalContext ctx, InetAddress address, int port, MessageListener listener,
@@ -120,7 +123,7 @@ class Connection {
                 new HashSet<InventoryVector>(),
                 new HashSet<InventoryVector>(),
                 new NetworkAddress.Builder().ip(address).port(port).stream(1).build(),
-                timeoutInSeconds);
+                timeoutInSeconds, cryptography().randomNonce());
     }
 
     public long getStartTime() {
@@ -362,7 +365,7 @@ class Connection {
             try (Socket socket = Connection.this.socket) {
                 initSocket(socket);
                 if (mode == CLIENT || mode == SYNC) {
-                    send(new Version.Builder().defaults().addrFrom(host).addrRecv(node).build());
+                    send(new Version.Builder().defaults(clientNonce).addrFrom(host).addrRecv(node).build());
                 }
                 while (state != DISCONNECTED) {
                     if (mode != SYNC) {
@@ -446,7 +449,7 @@ class Connection {
                 send(new VerAck());
                 switch (mode) {
                     case SERVER:
-                        send(new Version.Builder().defaults().addrFrom(host).addrRecv(node).build());
+                        send(new Version.Builder().defaults(clientNonce).addrFrom(host).addrRecv(node).build());
                         break;
                     case CLIENT:
                     case SYNC:
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java b/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
index 1163d1c..c25a31c 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
@@ -38,15 +38,17 @@ public class ConnectionOrganizer implements Runnable {
     private final InternalContext ctx;
     private final DefaultNetworkHandler networkHandler;
     private final NetworkHandler.MessageListener listener;
+    private final long clientNonce;
 
     private Connection initialConnection;
 
     public ConnectionOrganizer(InternalContext ctx,
                                DefaultNetworkHandler networkHandler,
-                               NetworkHandler.MessageListener listener) {
+                               NetworkHandler.MessageListener listener, long clientNonce) {
         this.ctx = ctx;
         this.networkHandler = networkHandler;
         this.listener = listener;
+        this.clientNonce = clientNonce;
     }
 
     @Override
@@ -91,7 +93,8 @@ public class ConnectionOrganizer implements Runnable {
                                 NETWORK_MAGIC_NUMBER - active, ctx.getStreams());
                         boolean first = active == 0 && initialConnection == null;
                         for (NetworkAddress address : addresses) {
-                            Connection c = new Connection(ctx, CLIENT, address, listener, networkHandler.requestedObjects);
+                            Connection c = new Connection(ctx, CLIENT, address, listener,
+                                    networkHandler.requestedObjects, clientNonce);
                             if (first) {
                                 initialConnection = c;
                                 first = false;
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
index 289aa79..635aed2 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
@@ -28,7 +28,6 @@ import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.NetworkHandler;
 import ch.dissem.bitmessage.utils.Collections;
 import ch.dissem.bitmessage.utils.Property;
-import ch.dissem.bitmessage.utils.ThreadFactoryBuilder;
 
 import java.io.IOException;
 import java.net.InetAddress;
@@ -109,9 +108,9 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
         try {
             running = true;
             connections.clear();
-            server = new ServerRunnable(ctx, this, listener);
+            server = new ServerRunnable(ctx, this, listener, ctx.getClientNonce());
             pool.execute(server);
-            pool.execute(new ConnectionOrganizer(ctx, this, listener));
+            pool.execute(new ConnectionOrganizer(ctx, this, listener, ctx.getClientNonce()));
         } catch (IOException e) {
             throw new ApplicationException(e);
         }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java b/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java
index bf6d6f6..5a866b9 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java
@@ -37,12 +37,15 @@ public class ServerRunnable implements Runnable, Closeable {
     private final ServerSocket serverSocket;
     private final DefaultNetworkHandler networkHandler;
     private final NetworkHandler.MessageListener listener;
+    private final long clientNonce;
 
-    public ServerRunnable(InternalContext ctx, DefaultNetworkHandler networkHandler, NetworkHandler.MessageListener listener) throws IOException {
+    public ServerRunnable(InternalContext ctx, DefaultNetworkHandler networkHandler,
+                          NetworkHandler.MessageListener listener, long clientNonce) throws IOException {
         this.ctx = ctx;
         this.networkHandler = networkHandler;
         this.listener = listener;
         this.serverSocket = new ServerSocket(ctx.getPort());
+        this.clientNonce = clientNonce;
     }
 
     @Override
@@ -52,7 +55,7 @@ public class ServerRunnable implements Runnable, Closeable {
                 Socket socket = serverSocket.accept();
                 socket.setSoTimeout(Connection.READ_TIMEOUT);
                 networkHandler.startConnection(new Connection(ctx, SERVER, socket, listener,
-                        networkHandler.requestedObjects));
+                        networkHandler.requestedObjects, clientNonce));
             } catch (IOException e) {
                 LOG.debug(e.getMessage(), e);
             }
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
index ffc639f..7ac42f9 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
@@ -24,6 +24,8 @@ import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.ports.MessageRepository;
 import ch.dissem.bitmessage.utils.Strings;
+import ch.dissem.bitmessage.utils.TTL;
+import ch.dissem.bitmessage.utils.UnixTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -165,13 +167,20 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
         return find("sender='" + sender.getAddress() + "'");
     }
 
+    @Override
+    public List<Plaintext> findMessagesToResend() {
+        return find("status='" + Plaintext.Status.SENT.name() + "'" +
+                " AND next_try < " + UnixTime.now());
+    }
+
     private List<Plaintext> find(String where) {
         List<Plaintext> result = new LinkedList<>();
         try (
                 Connection connection = config.getConnection();
                 Statement stmt = connection.createStatement();
-                ResultSet rs = stmt.executeQuery("SELECT id, iv, type, sender, recipient, data, ack_data, sent, received, status " +
-                        "FROM Message WHERE " + where)
+                ResultSet rs = stmt.executeQuery(
+                        "SELECT id, iv, type, sender, recipient, data, ack_data, sent, received, initial_hash, status, ttl, retries, next_try " +
+                                "FROM Message WHERE " + where)
         ) {
             while (rs.next()) {
                 byte[] iv = rs.getBytes("iv");
@@ -187,8 +196,13 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
                 builder.sent(rs.getLong("sent"));
                 builder.received(rs.getLong("received"));
                 builder.status(Plaintext.Status.valueOf(rs.getString("status")));
+                builder.ttl(rs.getLong("ttl"));
+                builder.retries(rs.getInt("retries"));
+                builder.nextTry(rs.getLong("next_try"));
                 builder.labels(findLabels(connection, id));
-                result.add(builder.build());
+                Plaintext message = builder.build();
+                message.setInitialHash(rs.getBytes("initial_hash"));
+                result.add(message);
             }
         } catch (IOException | SQLException e) {
             LOG.error(e.getMessage(), e);
@@ -265,8 +279,9 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
 
     private void insert(Connection connection, Plaintext message) throws SQLException, IOException {
         try (PreparedStatement ps = connection.prepareStatement(
-                "INSERT INTO Message (iv, type, sender, recipient, data, ack_data, sent, received, status, initial_hash) " +
-                        "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+                "INSERT INTO Message (iv, type, sender, recipient, data, ack_data, sent, received, " +
+                        "status, initial_hash, ttl, retries, next_try) " +
+                        "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
                 Statement.RETURN_GENERATED_KEYS)
         ) {
             ps.setBytes(1, message.getInventoryVector() == null ? null : message.getInventoryVector().getHash());
@@ -279,6 +294,9 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
             ps.setLong(8, message.getReceived());
             ps.setString(9, message.getStatus() == null ? null : message.getStatus().name());
             ps.setBytes(10, message.getInitialHash());
+            ps.setLong(11, message.getTTL());
+            ps.setInt(12, message.getRetries());
+            ps.setObject(13, message.getNextTry());
 
             ps.executeUpdate();
             // get generated id
@@ -291,13 +309,23 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
 
     private void update(Connection connection, Plaintext message) throws SQLException, IOException {
         try (PreparedStatement ps = connection.prepareStatement(
-                "UPDATE Message SET iv=?, sent=?, received=?, status=?, initial_hash=? WHERE id=?")) {
+                "UPDATE Message SET iv=?, type=?, sender=?, recipient=?, data=?, ack_data=?, sent=?, received=?, " +
+                        "status=?, initial_hash=?, ttl=?, retries=?, next_try=? " +
+                        "WHERE id=?")) {
             ps.setBytes(1, message.getInventoryVector() == null ? null : message.getInventoryVector().getHash());
-            ps.setLong(2, message.getSent());
-            ps.setLong(3, message.getReceived());
-            ps.setString(4, message.getStatus() == null ? null : message.getStatus().name());
-            ps.setBytes(5, message.getInitialHash());
-            ps.setLong(6, (Long) message.getId());
+            ps.setString(2, message.getType().name());
+            ps.setString(3, message.getFrom().getAddress());
+            ps.setString(4, message.getTo() == null ? null : message.getTo().getAddress());
+            writeBlob(ps, 5, message);
+            ps.setBytes(6, message.getAckData());
+            ps.setLong(7, message.getSent());
+            ps.setLong(8, message.getReceived());
+            ps.setString(9, message.getStatus() == null ? null : message.getStatus().name());
+            ps.setBytes(10, message.getInitialHash());
+            ps.setLong(11, message.getTTL());
+            ps.setInt(12, message.getRetries());
+            ps.setObject(13, message.getNextTry());
+            ps.setLong(14, (Long) message.getId());
             ps.executeUpdate();
         }
     }
diff --git a/repositories/src/main/resources/db/migration/V3.2__Update_table_message.sql b/repositories/src/main/resources/db/migration/V3.2__Update_table_message.sql
index 8b43b0a..38847cf 100644
--- a/repositories/src/main/resources/db/migration/V3.2__Update_table_message.sql
+++ b/repositories/src/main/resources/db/migration/V3.2__Update_table_message.sql
@@ -1 +1,4 @@
 ALTER TABLE Message ADD COLUMN ack_data BINARY(32);
+ALTER TABLE Message ADD COLUMN ttl      BIGINT NOT NULL;
+ALTER TABLE Message ADD COLUMN retries  INT NOT NULL DEFAULT 0;
+ALTER TABLE Message ADD COLUMN next_try BIGINT;
diff --git a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
index 81051de..df8a42e 100644
--- a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
+++ b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
@@ -19,6 +19,7 @@ package ch.dissem.bitmessage.repository;
 import ch.dissem.bitmessage.BitmessageContext;
 import ch.dissem.bitmessage.InternalContext;
 import ch.dissem.bitmessage.entity.BitmessageAddress;
+import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.Label;
@@ -32,6 +33,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
+import static ch.dissem.bitmessage.entity.payload.Pubkey.Feature.DOES_ACK;
 import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.*;
@@ -59,14 +61,14 @@ public class JdbcMessageRepositoryTest extends TestBase {
                 .messageRepo(repo)
         );
 
-        BitmessageAddress tmp = new BitmessageAddress(new PrivateKey(false, 1, 1000, 1000));
+        BitmessageAddress tmp = new BitmessageAddress(new PrivateKey(false, 1, 1000, 1000, DOES_ACK));
         contactA = new BitmessageAddress(tmp.getAddress());
         contactA.setPubkey(tmp.getPubkey());
         addressRepo.save(contactA);
         contactB = new BitmessageAddress("BM-2cTtkBnb4BUYDndTKun6D9PjtueP2h1bQj");
         addressRepo.save(contactB);
 
-        identity = new BitmessageAddress(new PrivateKey(false, 1, 1000, 1000));
+        identity = new BitmessageAddress(new PrivateKey(false, 1, 1000, 1000, DOES_ACK));
         addressRepo.save(identity);
 
         inbox = repo.getLabels(Label.Type.INBOX).get(0);
@@ -123,6 +125,18 @@ public class JdbcMessageRepositoryTest extends TestBase {
         assertThat(other, is(message));
     }
 
+    @Test
+    public void ensureAckMessageCanBeUpdatedAndRetrieved() {
+        byte[] initialHash = new byte[64];
+        Plaintext message = repo.findMessages(contactA).get(0);
+        message.setInitialHash(initialHash);
+        ObjectMessage ackMessage = message.getAckMessage();
+        repo.save(message);
+        Plaintext other = repo.getMessage(initialHash);
+        assertThat(other, is(message));
+        assertThat(other.getAckMessage(), is(ackMessage));
+    }
+
     @Test
     public void testFindMessagesByStatus() throws Exception {
         List<Plaintext> messages = repo.findMessages(Plaintext.Status.RECEIVED);

From c3d8a07e8385335856040bdfe8fdd13aa961ad5d Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 20 May 2016 23:00:27 +0200
Subject: [PATCH 43/87] Added unit tests and fixed bug

---
 .../dissem/bitmessage/entity/Plaintext.java   |  8 ++--
 .../bitmessage/BitmessageContextTest.java     | 25 ++++++++++--
 .../repository/JdbcMessageRepositoryTest.java | 38 +++++++++++++++++--
 3 files changed, 59 insertions(+), 12 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
index 90c3c50..4bfaba4 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
@@ -22,13 +22,11 @@ import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.factory.Factory;
-import ch.dissem.bitmessage.utils.Decode;
-import ch.dissem.bitmessage.utils.Encode;
-import ch.dissem.bitmessage.utils.TTL;
-import ch.dissem.bitmessage.utils.UnixTime;
+import ch.dissem.bitmessage.utils.*;
 
 import java.io.*;
 import java.util.*;
+import java.util.Collections;
 
 import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
@@ -245,7 +243,7 @@ public class Plaintext implements Streamable {
     public void updateNextTry() {
         if (nextTry == null) {
             if (sent != null && to.has(Feature.DOES_ACK)) {
-                nextTry = sent + ttl;
+                nextTry = UnixTime.now(+ttl);
                 retries++;
             }
         } else {
diff --git a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
index 6e49853..5ad91cb 100644
--- a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
@@ -20,6 +20,7 @@ import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.Plaintext;
+import ch.dissem.bitmessage.entity.Plaintext.Type;
 import ch.dissem.bitmessage.entity.payload.ObjectType;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
@@ -63,6 +64,7 @@ public class BitmessageContextTest {
                 .messageRepo(mock(MessageRepository.class))
                 .networkHandler(mock(NetworkHandler.class))
                 .nodeRegistry(mock(NodeRegistry.class))
+                .labeler(spy(new DefaultLabeler()))
                 .powRepo(spy(new ProofOfWorkRepository() {
                     Map<InventoryVector, Item> items = new HashMap<>();
 
@@ -205,7 +207,7 @@ public class BitmessageContextTest {
         assertEquals(2, ctx.internals().getProofOfWorkRepository().getItems().size());
         verify(ctx.internals().getProofOfWorkRepository(), timeout(10000).atLeastOnce())
                 .putObject(object(MSG), eq(1000L), eq(1000L));
-        verify(ctx.messages(), timeout(10000).atLeastOnce()).save(MessageMatchers.plaintext(Plaintext.Type.MSG));
+        verify(ctx.messages(), timeout(10000).atLeastOnce()).save(MessageMatchers.plaintext(Type.MSG));
     }
 
     @Test
@@ -215,7 +217,7 @@ public class BitmessageContextTest {
                 "Subject", "Message");
         verify(ctx.internals().getProofOfWorkRepository(), timeout(10000).atLeastOnce())
                 .putObject(object(GET_PUBKEY), eq(1000L), eq(1000L));
-        verify(ctx.messages(), timeout(10000).atLeastOnce()).save(MessageMatchers.plaintext(Plaintext.Type.MSG));
+        verify(ctx.messages(), timeout(10000).atLeastOnce()).save(MessageMatchers.plaintext(Type.MSG));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -234,12 +236,12 @@ public class BitmessageContextTest {
         verify(ctx.internals().getProofOfWorkEngine())
                 .calculateNonce(any(byte[].class), any(byte[].class), any(ProofOfWorkEngine.Callback.class));
         verify(ctx.messages(), timeout(10000).atLeastOnce())
-                .save(MessageMatchers.plaintext(Plaintext.Type.BROADCAST));
+                .save(MessageMatchers.plaintext(Type.BROADCAST));
     }
 
     @Test(expected = IllegalArgumentException.class)
     public void ensureSenderWithoutPrivateKeyThrowsException() {
-        Plaintext msg = new Plaintext.Builder(Plaintext.Type.BROADCAST)
+        Plaintext msg = new Plaintext.Builder(Type.BROADCAST)
                 .from(new BitmessageAddress("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8"))
                 .message("Subject", "Message")
                 .build();
@@ -295,4 +297,19 @@ public class BitmessageContextTest {
         assertEquals(chan.getVersion(), Pubkey.LATEST_VERSION);
         assertTrue(chan.isChan());
     }
+
+    @Test
+    public void ensureUnacknowledgedMessageIsResent() throws Exception {
+        Plaintext plaintext = new Plaintext.Builder(Type.MSG)
+                .ttl(1)
+                .message("subject", "message")
+                .from(TestUtils.loadIdentity("BM-2cSqjfJ8xK6UUn5Rw3RpdGQ9RsDkBhWnS8"))
+                .to(TestUtils.loadContact())
+                .build();
+        assertTrue(plaintext.getTo().has(Pubkey.Feature.DOES_ACK));
+        when(ctx.messages().findMessagesToResend()).thenReturn(Collections.singletonList(plaintext));
+        when(ctx.messages().getMessage(any(byte[].class))).thenReturn(plaintext);
+        ctx.internals().resendUnacknowledged();
+        verify(ctx.labeler(), timeout(1000).times(1)).markAsSent(eq(plaintext));
+    }
 }
diff --git a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
index df8a42e..5fa88e7 100644
--- a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
+++ b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
@@ -26,6 +26,8 @@ import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
 import ch.dissem.bitmessage.ports.AddressRepository;
 import ch.dissem.bitmessage.ports.MessageRepository;
+import ch.dissem.bitmessage.utils.UnixTime;
+import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -36,6 +38,7 @@ import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
 import static ch.dissem.bitmessage.entity.payload.Pubkey.Feature.DOES_ACK;
 import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
 public class JdbcMessageRepositoryTest extends TestBase {
@@ -192,11 +195,40 @@ public class JdbcMessageRepositoryTest extends TestBase {
     }
 
     @Test
-    public void testRemove() throws Exception {
+    public void ensureMessageIsRemoved() throws Exception {
         Plaintext toRemove = repo.findMessages(Plaintext.Status.DRAFT, contactB).get(0);
-        repo.remove(toRemove);
         List<Plaintext> messages = repo.findMessages(Plaintext.Status.DRAFT);
-        assertEquals(1, messages.size());
+        assertEquals(2, messages.size());
+        repo.remove(toRemove);
+        messages = repo.findMessages(Plaintext.Status.DRAFT);
+        assertThat(messages, hasSize(1));
+    }
+
+    @Test
+    public void ensureUnacknowledgedMessagesAreFoundForResend() throws Exception {
+        Plaintext message = new Plaintext.Builder(MSG)
+                .IV(new InventoryVector(cryptography().randomBytes(32)))
+                .from(identity)
+                .to(contactA)
+                .message("Subject", "Message")
+                .status(Plaintext.Status.SENT)
+                .ttl(1)
+                .build();
+        message.updateNextTry();
+        assertThat(message.getRetries(), is(1));
+        assertThat(message.getNextTry(), greaterThan(UnixTime.now()));
+        assertThat(message.getNextTry(), lessThanOrEqualTo(UnixTime.now(+1)));
+        repo.save(message);
+        Thread.sleep(2100);
+        List<Plaintext> messagesToResend = repo.findMessagesToResend();
+        assertThat(messagesToResend, hasSize(1));
+
+        message.updateNextTry();
+        assertThat(message.getRetries(), is(2));
+        assertThat(message.getNextTry(), greaterThan(UnixTime.now()));
+        repo.save(message);
+        messagesToResend = repo.findMessagesToResend();
+        assertThat(messagesToResend, empty());
     }
 
     private void addMessage(BitmessageAddress from, BitmessageAddress to, Plaintext.Status status, Label... labels) {

From 14849a82ea67136190f6ce1699596fbc328f94fc Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 20 May 2016 23:58:08 +0200
Subject: [PATCH 44/87] Refactored JdbcMessageRepository so that alternative
 implementations can be done easier

---
 .gitignore                                    |   1 +
 .../ports/AbstractMessageRepository.java      | 123 +++++++++++++++++
 .../dissem/bitmessage/utils/SqlStrings.java   |  59 ++++++++
 .../bitmessage/utils/SqlStringsTest.java      |   8 +-
 .../bitmessage/repository/JdbcHelper.java     |  46 +------
 .../bitmessage/repository/JdbcInventory.java  |   1 +
 .../repository/JdbcMessageRepository.java     | 127 +++---------------
 7 files changed, 206 insertions(+), 159 deletions(-)
 create mode 100644 core/src/main/java/ch/dissem/bitmessage/ports/AbstractMessageRepository.java
 create mode 100644 core/src/main/java/ch/dissem/bitmessage/utils/SqlStrings.java
 rename repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcHelperTest.java => core/src/test/java/ch/dissem/bitmessage/utils/SqlStringsTest.java (81%)

diff --git a/.gitignore b/.gitignore
index fd29962..98d31cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 ### Gradle ###
 .gradle
 build/
+classes/
 
 # Ignore Gradle GUI config
 gradle-app.setting
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/AbstractMessageRepository.java b/core/src/main/java/ch/dissem/bitmessage/ports/AbstractMessageRepository.java
new file mode 100644
index 0000000..e037c4f
--- /dev/null
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/AbstractMessageRepository.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.ports;
+
+import ch.dissem.bitmessage.InternalContext;
+import ch.dissem.bitmessage.entity.BitmessageAddress;
+import ch.dissem.bitmessage.entity.Plaintext;
+import ch.dissem.bitmessage.entity.valueobject.Label;
+import ch.dissem.bitmessage.exception.ApplicationException;
+import ch.dissem.bitmessage.utils.Strings;
+import ch.dissem.bitmessage.utils.UnixTime;
+
+import java.util.Collection;
+import java.util.List;
+
+import static ch.dissem.bitmessage.utils.SqlStrings.join;
+
+public abstract class AbstractMessageRepository implements MessageRepository, InternalContext.ContextHolder {
+    protected InternalContext ctx;
+
+    @Override
+    public void setContext(InternalContext context) {
+        this.ctx = context;
+    }
+
+    protected void safeSenderIfNecessary(Plaintext message) {
+        if (message.getId() == null) {
+            BitmessageAddress savedAddress = ctx.getAddressRepository().getAddress(message.getFrom().getAddress());
+            if (savedAddress == null) {
+                ctx.getAddressRepository().save(message.getFrom());
+            } else if (savedAddress.getPubkey() == null && message.getFrom().getPubkey() != null) {
+                savedAddress.setPubkey(message.getFrom().getPubkey());
+                ctx.getAddressRepository().save(savedAddress);
+            }
+        }
+    }
+
+    @Override
+    public Plaintext getMessage(Object id) {
+        if (id instanceof Long) {
+            return single(find("id=" + id));
+        } else {
+            throw new IllegalArgumentException("Long expected for ID");
+        }
+    }
+
+    @Override
+    public Plaintext getMessage(byte[] initialHash) {
+        return single(find("initial_hash=X'" + Strings.hex(initialHash) + "'"));
+    }
+
+    @Override
+    public Plaintext getMessageForAck(byte[] ackData) {
+        return single(find("ack_data=X'" + Strings.hex(ackData) + "' AND status='" + Plaintext.Status.SENT + "'"));
+    }
+
+    @Override
+    public List<Plaintext> findMessages(Label label) {
+        return find("id IN (SELECT message_id FROM Message_Label WHERE label_id=" + label.getId() + ")");
+    }
+
+    @Override
+    public List<Plaintext> findMessages(Plaintext.Status status, BitmessageAddress recipient) {
+        return find("status='" + status.name() + "' AND recipient='" + recipient.getAddress() + "'");
+    }
+
+    @Override
+    public List<Plaintext> findMessages(Plaintext.Status status) {
+        return find("status='" + status.name() + "'");
+    }
+
+    @Override
+    public List<Plaintext> findMessages(BitmessageAddress sender) {
+        return find("sender='" + sender.getAddress() + "'");
+    }
+
+    @Override
+    public List<Plaintext> findMessagesToResend() {
+        return find("status='" + Plaintext.Status.SENT.name() + "'" +
+                " AND next_try < " + UnixTime.now());
+    }
+
+    @Override
+    public List<Label> getLabels() {
+        return findLabels("1=1");
+    }
+
+    @Override
+    public List<Label> getLabels(Label.Type... types) {
+        return findLabels("type IN (" + join(types) + ")");
+    }
+
+    protected abstract List<Label> findLabels(String where);
+
+
+    protected <T> T single(Collection<T> collection) {
+        switch (collection.size()) {
+            case 0:
+                return null;
+            case 1:
+                return collection.iterator().next();
+            default:
+                throw new ApplicationException("This shouldn't happen, found " + collection.size() +
+                        " items, one or none was expected");
+        }
+    }
+
+    protected abstract List<Plaintext> find(String where);
+}
diff --git a/core/src/main/java/ch/dissem/bitmessage/utils/SqlStrings.java b/core/src/main/java/ch/dissem/bitmessage/utils/SqlStrings.java
new file mode 100644
index 0000000..82d06e3
--- /dev/null
+++ b/core/src/main/java/ch/dissem/bitmessage/utils/SqlStrings.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.utils;
+
+import ch.dissem.bitmessage.entity.payload.ObjectType;
+
+import static ch.dissem.bitmessage.utils.Strings.hex;
+
+public class SqlStrings {
+    public static StringBuilder join(long... objects) {
+        StringBuilder streamList = new StringBuilder();
+        for (int i = 0; i < objects.length; i++) {
+            if (i > 0) streamList.append(", ");
+            streamList.append(objects[i]);
+        }
+        return streamList;
+    }
+
+    public static StringBuilder join(byte[]... objects) {
+        StringBuilder streamList = new StringBuilder();
+        for (int i = 0; i < objects.length; i++) {
+            if (i > 0) streamList.append(", ");
+            streamList.append(hex(objects[i]));
+        }
+        return streamList;
+    }
+
+    public static StringBuilder join(ObjectType... types) {
+        StringBuilder streamList = new StringBuilder();
+        for (int i = 0; i < types.length; i++) {
+            if (i > 0) streamList.append(", ");
+            streamList.append(types[i].getNumber());
+        }
+        return streamList;
+    }
+
+    public static StringBuilder join(Enum... types) {
+        StringBuilder streamList = new StringBuilder();
+        for (int i = 0; i < types.length; i++) {
+            if (i > 0) streamList.append(", ");
+            streamList.append('\'').append(types[i].name()).append('\'');
+        }
+        return streamList;
+    }
+}
diff --git a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcHelperTest.java b/core/src/test/java/ch/dissem/bitmessage/utils/SqlStringsTest.java
similarity index 81%
rename from repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcHelperTest.java
rename to core/src/test/java/ch/dissem/bitmessage/utils/SqlStringsTest.java
index ee3a580..2aa1113 100644
--- a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcHelperTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/utils/SqlStringsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Christian Basler
+ * Copyright 2016 Christian Basler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package ch.dissem.bitmessage.repository;
+package ch.dissem.bitmessage.utils;
 
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
 
-public class JdbcHelperTest {
+public class SqlStringsTest {
     @Test
     public void ensureJoinWorksWithLongArray() {
         long[] test = {1L, 2L};
-        assertEquals("1, 2", JdbcHelper.join(test).toString());
+        assertEquals("1, 2", SqlStrings.join(test).toString());
     }
 }
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcHelper.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcHelper.java
index beb4c80..b0be9c1 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcHelper.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcHelper.java
@@ -42,43 +42,7 @@ public abstract class JdbcHelper {
         this.config = config;
     }
 
-    public static StringBuilder join(long... objects) {
-        StringBuilder streamList = new StringBuilder();
-        for (int i = 0; i < objects.length; i++) {
-            if (i > 0) streamList.append(", ");
-            streamList.append(objects[i]);
-        }
-        return streamList;
-    }
-
-    public static StringBuilder join(byte[]... objects) {
-        StringBuilder streamList = new StringBuilder();
-        for (int i = 0; i < objects.length; i++) {
-            if (i > 0) streamList.append(", ");
-            streamList.append(hex(objects[i]));
-        }
-        return streamList;
-    }
-
-    public static StringBuilder join(ObjectType... types) {
-        StringBuilder streamList = new StringBuilder();
-        for (int i = 0; i < types.length; i++) {
-            if (i > 0) streamList.append(", ");
-            streamList.append(types[i].getNumber());
-        }
-        return streamList;
-    }
-
-    public static StringBuilder join(Enum... types) {
-        StringBuilder streamList = new StringBuilder();
-        for (int i = 0; i < types.length; i++) {
-            if (i > 0) streamList.append(", ");
-            streamList.append('\'').append(types[i].name()).append('\'');
-        }
-        return streamList;
-    }
-
-    protected void writeBlob(PreparedStatement ps, int parameterIndex, Streamable data) throws SQLException, IOException {
+    public static void writeBlob(PreparedStatement ps, int parameterIndex, Streamable data) throws SQLException, IOException {
         if (data == null) {
             ps.setBytes(parameterIndex, null);
         } else {
@@ -87,12 +51,4 @@ public abstract class JdbcHelper {
             ps.setBytes(parameterIndex, os.toByteArray());
         }
     }
-
-    protected <T> T single(Collection<T> collection) {
-        if (collection.size() > 1) {
-            throw new ApplicationException("This shouldn't happen, found " + collection.size() +
-                    " messages, one or none was expected");
-        }
-        return collection.stream().findAny().orElse(null);
-    }
 }
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java
index 0cc9f3b..13d3725 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcInventory.java
@@ -31,6 +31,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static ch.dissem.bitmessage.utils.SqlStrings.join;
 import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
 import static ch.dissem.bitmessage.utils.UnixTime.now;
 
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
index 7ac42f9..403754a 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
@@ -16,16 +16,12 @@
 
 package ch.dissem.bitmessage.repository;
 
-import ch.dissem.bitmessage.InternalContext;
-import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.Label;
 import ch.dissem.bitmessage.exception.ApplicationException;
+import ch.dissem.bitmessage.ports.AbstractMessageRepository;
 import ch.dissem.bitmessage.ports.MessageRepository;
-import ch.dissem.bitmessage.utils.Strings;
-import ch.dissem.bitmessage.utils.TTL;
-import ch.dissem.bitmessage.utils.UnixTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -33,34 +29,30 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.sql.*;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
-public class JdbcMessageRepository extends JdbcHelper implements MessageRepository, InternalContext.ContextHolder {
+import static ch.dissem.bitmessage.repository.JdbcHelper.writeBlob;
+
+public class JdbcMessageRepository extends AbstractMessageRepository implements MessageRepository {
     private static final Logger LOG = LoggerFactory.getLogger(JdbcMessageRepository.class);
 
-    private InternalContext ctx;
+    private final JdbcConfig config;
 
     public JdbcMessageRepository(JdbcConfig config) {
-        super(config);
+        this.config = config;
     }
 
     @Override
-    public List<Label> getLabels() {
-        List<Label> result = new LinkedList<>();
+    protected List<Label> findLabels(String where) {
         try (
-                Connection connection = config.getConnection();
-                Statement stmt = connection.createStatement();
-                ResultSet rs = stmt.executeQuery("SELECT id, label, type, color FROM Label ORDER BY ord")
+                Connection connection = config.getConnection()
         ) {
-            while (rs.next()) {
-                result.add(getLabel(rs));
-            }
+            return findLabels(connection, where);
         } catch (SQLException e) {
-            throw new ApplicationException(e);
+            LOG.error(e.getMessage(), e);
         }
-        return result;
+        return new ArrayList<>();
     }
 
     private Label getLabel(ResultSet rs) throws SQLException {
@@ -75,24 +67,6 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
         return label;
     }
 
-    @Override
-    public List<Label> getLabels(Label.Type... types) {
-        List<Label> result = new LinkedList<>();
-        try (
-                Connection connection = config.getConnection();
-                Statement stmt = connection.createStatement();
-                ResultSet rs = stmt.executeQuery("SELECT id, label, type, color FROM Label WHERE type IN (" + join(types) +
-                        ") ORDER BY ord")
-        ) {
-            while (rs.next()) {
-                result.add(getLabel(rs));
-            }
-        } catch (SQLException e) {
-            LOG.error(e.getMessage(), e);
-        }
-        return result;
-    }
-
     @Override
     public int countUnread(Label label) {
         String where;
@@ -120,60 +94,7 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
     }
 
     @Override
-    public Plaintext getMessage(Object id) {
-        if (id instanceof Long) {
-            List<Plaintext> plaintexts = find("id=" + id);
-            switch (plaintexts.size()) {
-                case 0:
-                    return null;
-                case 1:
-                    return plaintexts.get(0);
-                default:
-                    throw new ApplicationException("This shouldn't happen, found " + plaintexts.size() +
-                            " messages, one or none was expected");
-            }
-        } else {
-            throw new IllegalArgumentException("Long expected for ID");
-        }
-    }
-
-    @Override
-    public Plaintext getMessage(byte[] initialHash) {
-        return single(find("initial_hash=X'" + Strings.hex(initialHash) + "'"));
-    }
-
-    @Override
-    public Plaintext getMessageForAck(byte[] ackData) {
-        return single(find("ack_data=X'" + Strings.hex(ackData) + "' AND status='" + Plaintext.Status.SENT + "'"));
-    }
-
-    @Override
-    public List<Plaintext> findMessages(Label label) {
-        return find("id IN (SELECT message_id FROM Message_Label WHERE label_id=" + label.getId() + ")");
-    }
-
-    @Override
-    public List<Plaintext> findMessages(Plaintext.Status status, BitmessageAddress recipient) {
-        return find("status='" + status.name() + "' AND recipient='" + recipient.getAddress() + "'");
-    }
-
-    @Override
-    public List<Plaintext> findMessages(Plaintext.Status status) {
-        return find("status='" + status.name() + "'");
-    }
-
-    @Override
-    public List<Plaintext> findMessages(BitmessageAddress sender) {
-        return find("sender='" + sender.getAddress() + "'");
-    }
-
-    @Override
-    public List<Plaintext> findMessagesToResend() {
-        return find("status='" + Plaintext.Status.SENT.name() + "'" +
-                " AND next_try < " + UnixTime.now());
-    }
-
-    private List<Plaintext> find(String where) {
+    protected List<Plaintext> find(String where) {
         List<Plaintext> result = new LinkedList<>();
         try (
                 Connection connection = config.getConnection();
@@ -199,7 +120,8 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
                 builder.ttl(rs.getLong("ttl"));
                 builder.retries(rs.getInt("retries"));
                 builder.nextTry(rs.getLong("next_try"));
-                builder.labels(findLabels(connection, id));
+                builder.labels(findLabels(connection,
+                        "WHERE id IN (SELECT label_id FROM Message_Label WHERE message_id=" + id + ") ORDER BY ord"));
                 Plaintext message = builder.build();
                 message.setInitialHash(rs.getBytes("initial_hash"));
                 result.add(message);
@@ -210,12 +132,11 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
         return result;
     }
 
-    private Collection<Label> findLabels(Connection connection, long messageId) {
+    private List<Label> findLabels(Connection connection, String where) {
         List<Label> result = new ArrayList<>();
         try (
                 Statement stmt = connection.createStatement();
-                ResultSet rs = stmt.executeQuery("SELECT id, label, type, color FROM Label " +
-                        "WHERE id IN (SELECT label_id FROM Message_Label WHERE message_id=" + messageId + ")")
+                ResultSet rs = stmt.executeQuery("SELECT id, label, type, color FROM Label WHERE " + where)
         ) {
             while (rs.next()) {
                 result.add(getLabel(rs));
@@ -228,16 +149,7 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
 
     @Override
     public void save(Plaintext message) {
-        // save from address if necessary
-        if (message.getId() == null) {
-            BitmessageAddress savedAddress = ctx.getAddressRepository().getAddress(message.getFrom().getAddress());
-            if (savedAddress == null) {
-                ctx.getAddressRepository().save(message.getFrom());
-            } else if (savedAddress.getPubkey() == null && message.getFrom().getPubkey() != null) {
-                savedAddress.setPubkey(message.getFrom().getPubkey());
-                ctx.getAddressRepository().save(savedAddress);
-            }
-        }
+        safeSenderIfNecessary(message);
 
         try (Connection connection = config.getConnection()) {
             try {
@@ -350,9 +262,4 @@ public class JdbcMessageRepository extends JdbcHelper implements MessageReposito
             LOG.error(e.getMessage(), e);
         }
     }
-
-    @Override
-    public void setContext(InternalContext context) {
-        this.ctx = context;
-    }
 }

From ed6344c6627ddd11a128aaa670f3364bdead5c47 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 23 May 2016 20:11:44 +0200
Subject: [PATCH 45/87] Added BitmessageContext method to resent unacknowledged
 messages and updated README.md

---
 README.md                                     | 50 +++++++++++++------
 .../dissem/bitmessage/BitmessageContext.java  | 23 +++++++++
 .../bitmessage/BitmessageContextTest.java     |  2 +-
 3 files changed, 60 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 6c44558..fd9d955 100644
--- a/README.md
+++ b/README.md
@@ -5,10 +5,10 @@ Jabit
 [![Apache 2](https://img.shields.io/badge/license-Apache_2.0-blue.svg)](https://raw.githubusercontent.com/Dissem/Jabit/master/LICENSE)
 [![Visit our IRC channel](https://img.shields.io/badge/irc-%23jabit-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/#jabit)
 
-A Java implementation for the Bitmessage protocol. To build, use command `gradle build` or `./gradlew build`.
+A Java implementation for the Bitmessage protocol. To build, use command
+`gradle build` or `./gradlew build`.
 
-Please note that it still has its limitations, but the API should now be stable. Jabit uses Semantic Versioning, meaning
-as long as the major version doesn't change, nothing should break if you update.
+Please note that it still has its limitations, but the API should now be stable. Jabit uses Semantic Versioning, meaning as long as the major version doesn't change, nothing should break if you update.
 
 #### Master
 [![Build Status](https://travis-ci.org/Dissem/Jabit.svg?branch=master)](https://travis-ci.org/Dissem/Jabit) 
@@ -23,9 +23,7 @@ as long as the major version doesn't change, nothing should break if you update.
 Security
 --------
 
-There are most probably some security issues, me programming this thing all by myself. Jabit doesn't do anything against
-timing attacks yet, for example. Please feel free to use the library, report bugs and maybe even help out. I hope the
-code is easy to understand and work with.
+There are most probably some security issues, me programming this thing all by myself. Jabit doesn't do anything against timing attacks yet, for example. Please feel free to use the library, report bugs and maybe even help out. I hope the code is easy to understand and work with.
 
 Project Status
 --------------
@@ -74,17 +72,22 @@ BitmessageContext ctx = new BitmessageContext.Builder()
         .nodeRegistry(new MemoryNodeRegistry())
         .networkHandler(new NetworkNode())
         .cryptography(new BouncyCryptography())
+        .listener(System.out::println)
         .build();
 ```
-This creates a simple context using a H2 database that will be created in the user's home directory. Next you'll need to
-start the context and decide what happens if a message arrives:
+This creates a simple context using a H2 database that will be created in the user's home directory. In the listener you decide what happens when a message arrives. If you can't use lambdas, you may instead write
 ```Java
-ctx.startup(new BitmessageContext.Listener() {
-    @Override
-    public void receive(Plaintext plaintext) {
-        // TODO: Notify the user
-    }
-});
+        .listener(new BitmessageContext.Listener() {
+            @Override
+            public void receive(Plaintext plaintext) {
+                // TODO: Notify the user
+            }
+        })
+```
+
+Next you'll need to start the context:
+```Java
+ctx.startup()
 ```
 Then you might want to create an identity
 ```Java
@@ -100,3 +103,22 @@ to which you can send some messages
 ```Java
 ctx.send(identity, contact, "Test", "Hello Chris, this is a message.");
 ```
+
+### Housekeeping
+
+As Bitmessage stores all currently valid messages, we'll need to delete expired objects from time to time:
+```Java
+ctx.cleanup();
+```
+If the client runs all the time, it might be a good idea to do this daily or at least weekly. Otherwise, you might just want to clean up on shutdown.
+
+Also, if some messages weren't acknowledged when it expired, they can be resent:
+```Java
+ctx.resendUnacknowledgedMessages();
+```
+This could be triggered periodically, or manually by the user. Please be aware that _if_ there is a message to resend, proof of work needs to be calculated, so to not annoy your users you might not want to trigger it on shutdown. As the client might have been offline for some time, it might as well be wise to wait until it caught up downloading new messages before resending those messages, after all they might be acknowledged by now.
+
+There probably won't happen extremely bad things if you don't - at least not more than otherwise - but you can properly shutdown the network connection by calling
+```Java
+ctx.shutdown();
+```
diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index ad21e72..032431d 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -221,10 +221,33 @@ public class BitmessageContext {
         return ctx.getNetworkHandler().send(server, port, request);
     }
 
+    /**
+     * Removes expired objects from the inventory. You should call this method regularly,
+     * e.g. daily and on each shutdown.
+     */
     public void cleanup() {
         ctx.getInventory().cleanup();
     }
 
+    /**
+     * Sends messages again whose time to live expired without being acknowledged. (And whose
+     * recipient is expected to send acknowledgements.
+     * <p>
+     *     You should call this method regularly, but be aware of the following:
+     *     <ul>
+     *         <li>As messages might be sent, POW will be done. It is therefore not advised to
+     *         call it on shutdown.</li>
+     *         <li>It shouldn't be called right after startup, as it's possible the missing
+     *         acknowledgement was sent while the client was offline.</li>
+     *         <li>Other than that, the call isn't expensive as long as there is no message
+     *         to send, so it might be a good idea to just call it every few minutes.</li>
+     *     </ul>
+     * </p>
+     */
+    public void resendUnacknowledgedMessages() {
+        ctx.resendUnacknowledged();
+    }
+
     public boolean isRunning() {
         return ctx.getNetworkHandler().isRunning();
     }
diff --git a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
index 5ad91cb..813ff20 100644
--- a/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/BitmessageContextTest.java
@@ -309,7 +309,7 @@ public class BitmessageContextTest {
         assertTrue(plaintext.getTo().has(Pubkey.Feature.DOES_ACK));
         when(ctx.messages().findMessagesToResend()).thenReturn(Collections.singletonList(plaintext));
         when(ctx.messages().getMessage(any(byte[].class))).thenReturn(plaintext);
-        ctx.internals().resendUnacknowledged();
+        ctx.resendUnacknowledgedMessages();
         verify(ctx.labeler(), timeout(1000).times(1)).markAsSent(eq(plaintext));
     }
 }

From 409dccd0beba0215ee899365a10edd0bed517cdd Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Tue, 24 May 2016 07:45:34 +0200
Subject: [PATCH 46/87] Fixed broken JavaDoc and removed unused import

---
 .../dissem/bitmessage/BitmessageContext.java  | 19 +++++++++----------
 .../entity/payload/ObjectPayload.java         |  1 -
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 032431d..1b9b402 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -233,16 +233,15 @@ public class BitmessageContext {
      * Sends messages again whose time to live expired without being acknowledged. (And whose
      * recipient is expected to send acknowledgements.
      * <p>
-     *     You should call this method regularly, but be aware of the following:
-     *     <ul>
-     *         <li>As messages might be sent, POW will be done. It is therefore not advised to
-     *         call it on shutdown.</li>
-     *         <li>It shouldn't be called right after startup, as it's possible the missing
-     *         acknowledgement was sent while the client was offline.</li>
-     *         <li>Other than that, the call isn't expensive as long as there is no message
-     *         to send, so it might be a good idea to just call it every few minutes.</li>
-     *     </ul>
-     * </p>
+     * You should call this method regularly, but be aware of the following:
+     * <ul>
+     * <li>As messages might be sent, POW will be done. It is therefore not advised to
+     * call it on shutdown.</li>
+     * <li>It shouldn't be called right after startup, as it's possible the missing
+     * acknowledgement was sent while the client was offline.</li>
+     * <li>Other than that, the call isn't expensive as long as there is no message
+     * to send, so it might be a good idea to just call it every few minutes.</li>
+     * </ul>
      */
     public void resendUnacknowledgedMessages() {
         ctx.resendUnacknowledged();
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java
index a7dbaff..33da28d 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/ObjectPayload.java
@@ -18,7 +18,6 @@ package ch.dissem.bitmessage.entity.payload;
 
 import ch.dissem.bitmessage.entity.ObjectMessage;
 import ch.dissem.bitmessage.entity.Streamable;
-import sun.reflect.generics.reflectiveObjects.NotImplementedException;
 
 import java.io.IOException;
 import java.io.OutputStream;

From 725d2b848e018cc8995feccf4a95c18bb5510f14 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Tue, 24 May 2016 17:19:29 +0200
Subject: [PATCH 47/87] Fixed migration and added resend and cleanup options to
 demo application

---
 .../dissem/bitmessage/BitmessageContext.java  |  3 ++-
 .../dissem/bitmessage/demo/Application.java   | 23 +++++++++++++++++--
 .../migration/V3.2__Update_table_message.sql  |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index 1b9b402..b06cf9a 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -281,7 +281,8 @@ public class BitmessageContext {
 
     public Property status() {
         return new Property("status", null,
-                ctx.getNetworkHandler().getNetworkStatus()
+                ctx.getNetworkHandler().getNetworkStatus(),
+                new Property("unacknowledged", ctx.getMessageRepository().findMessagesToResend().size())
         );
     }
 
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
index 89b91dc..583669b 100644
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
@@ -118,8 +118,27 @@ public class Application {
     }
 
     private void info() {
-        System.out.println();
-        System.out.println(ctx.status());
+        String command;
+        do {
+            System.out.println();
+            System.out.println(ctx.status());
+            System.out.println();
+            System.out.println("c) cleanup inventory");
+            System.out.println("r) resend unacknowledged messages");
+            System.out.println(COMMAND_BACK);
+
+            command = commandLine.nextCommand();
+            switch (command) {
+                case "c":
+                    ctx.cleanup();
+                    break;
+                case "r":
+                    ctx.resendUnacknowledgedMessages();
+                    break;
+                case "b":
+                    return;
+            }
+        } while (!"b".equals(command));
     }
 
     private void identities() {
diff --git a/repositories/src/main/resources/db/migration/V3.2__Update_table_message.sql b/repositories/src/main/resources/db/migration/V3.2__Update_table_message.sql
index 38847cf..1eba39f 100644
--- a/repositories/src/main/resources/db/migration/V3.2__Update_table_message.sql
+++ b/repositories/src/main/resources/db/migration/V3.2__Update_table_message.sql
@@ -1,4 +1,4 @@
 ALTER TABLE Message ADD COLUMN ack_data BINARY(32);
-ALTER TABLE Message ADD COLUMN ttl      BIGINT NOT NULL;
+ALTER TABLE Message ADD COLUMN ttl      BIGINT NOT NULL DEFAULT 0;
 ALTER TABLE Message ADD COLUMN retries  INT NOT NULL DEFAULT 0;
 ALTER TABLE Message ADD COLUMN next_try BIGINT;

From 22108527f3083696328ec7c00355d078470ca104 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Tue, 24 May 2016 19:35:41 +0200
Subject: [PATCH 48/87] Minor update to the README file

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fd9d955..16a2528 100644
--- a/README.md
+++ b/README.md
@@ -5,11 +5,12 @@ Jabit
 [![Apache 2](https://img.shields.io/badge/license-Apache_2.0-blue.svg)](https://raw.githubusercontent.com/Dissem/Jabit/master/LICENSE)
 [![Visit our IRC channel](https://img.shields.io/badge/irc-%23jabit-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/#jabit)
 
-A Java implementation for the Bitmessage protocol. To build, use command
-`gradle build` or `./gradlew build`.
+A Java implementation for the Bitmessage protocol. To build, use command `./gradlew build`.
 
 Please note that it still has its limitations, but the API should now be stable. Jabit uses Semantic Versioning, meaning as long as the major version doesn't change, nothing should break if you update.
 
+Be aware though that this doesn't necessarily applies for SNAPSHOT builds and the development branch, notably when it comes to database updates. _In other words, they may break your installation!_ 
+
 #### Master
 [![Build Status](https://travis-ci.org/Dissem/Jabit.svg?branch=master)](https://travis-ci.org/Dissem/Jabit) 
 [![Code Quality](https://img.shields.io/codacy/e9938d2adbb74a0db553115bef692ff3/master.svg)](https://www.codacy.com/app/chrigu-meyer/Jabit/dashboard?bid=3144281)

From 5c4892d153fbeb9ab10e8b2da19dec3783e3e784 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Thu, 26 May 2016 06:55:31 +0200
Subject: [PATCH 49/87] Added test

---
 .../networking/NetworkHandlerTest.java        | 76 ++++++++++++++++++-
 1 file changed, 75 insertions(+), 1 deletion(-)

diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index accb4c5..bffc220 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -17,21 +17,31 @@
 package ch.dissem.bitmessage.networking;
 
 import ch.dissem.bitmessage.BitmessageContext;
+import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
+import ch.dissem.bitmessage.entity.CustomMessage;
+import ch.dissem.bitmessage.entity.NetworkMessage;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
+import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.AddressRepository;
 import ch.dissem.bitmessage.ports.MessageRepository;
 import ch.dissem.bitmessage.ports.NetworkHandler;
 import ch.dissem.bitmessage.ports.ProofOfWorkRepository;
-import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.utils.Property;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.net.InetAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
 import java.util.concurrent.Future;
 
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
@@ -108,6 +118,31 @@ public class NetworkHandlerTest {
         }
     }
 
+    @Test
+    public void ensureCustomMessageIsSentAndResponseRetrieved() throws Exception {
+        final CustomMessage request = new CustomMessage("test request", cryptography().randomBytes(8));
+        try (TestServer server = new TestServer(new TestServer.ConnectionTester() {
+            @Override
+            public void test(InputStream in, OutputStream out) throws Exception {
+                NetworkMessage message = Factory.getNetworkMessage(3, in);
+                assertThat(message, notNullValue());
+                assertThat(message.getPayload(), instanceOf(CustomMessage.class));
+                CustomMessage payload = (CustomMessage) message.getPayload();
+                assertThat(payload.getCustomCommand(), is("test request"));
+                assertThat(payload.getData(), is(request.getData()));
+                new NetworkMessage(new CustomMessage("test response", payload.getData())).write(out);
+            }
+        })) {
+            CustomMessage response = networkHandler.send(InetAddress.getLocalHost(), server.getPort(), request);
+            assertThat(response, notNullValue());
+            assertThat(response.getCustomCommand(), is("test response"));
+            assertThat(response.getData(), is(request.getData()));
+            if (server.getException() != null) {
+                throw server.getException();
+            }
+        }
+    }
+
     @Test(timeout = 5_000)
     public void ensureObjectsAreSynchronizedIfBothHaveObjects() throws Exception {
         peerInventory.init(
@@ -168,4 +203,43 @@ public class NetworkHandlerTest {
         }
         assertEquals(expected, inventory.getInventory().size());
     }
+
+    private static class TestServer implements AutoCloseable {
+        private final ServerSocket socket;
+        private Exception exception;
+
+        private TestServer(final ConnectionTester tester) throws Exception {
+            socket = new ServerSocket(0);
+            new Thread(new Runnable() {
+                @Override
+                public void run() {
+                    while (!socket.isClosed()) {
+                        try {
+                            Socket connection = socket.accept();
+                            tester.test(connection.getInputStream(), connection.getOutputStream());
+                        } catch (Exception e) {
+                            exception = e;
+                        }
+                    }
+                }
+            }).start();
+        }
+
+        int getPort() {
+            return socket.getLocalPort();
+        }
+
+        public Exception getException() {
+            return exception;
+        }
+
+        @Override
+        public void close() throws Exception {
+            socket.close();
+        }
+
+        private interface ConnectionTester {
+            void test(InputStream in, OutputStream out) throws Exception;
+        }
+    }
 }

From b8f88b02d1fe228df1006991554c6017d49bdf6f Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Thu, 26 May 2016 22:50:37 +0200
Subject: [PATCH 50/87] Improved tests

---
 .../networking/NetworkHandlerTest.java        | 116 ++++++++----------
 1 file changed, 49 insertions(+), 67 deletions(-)

diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index bffc220..6e4f8d9 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -19,27 +19,21 @@ package ch.dissem.bitmessage.networking;
 import ch.dissem.bitmessage.BitmessageContext;
 import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.entity.CustomMessage;
-import ch.dissem.bitmessage.entity.NetworkMessage;
+import ch.dissem.bitmessage.entity.MessagePayload;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
-import ch.dissem.bitmessage.factory.Factory;
-import ch.dissem.bitmessage.ports.AddressRepository;
-import ch.dissem.bitmessage.ports.MessageRepository;
-import ch.dissem.bitmessage.ports.NetworkHandler;
-import ch.dissem.bitmessage.ports.ProofOfWorkRepository;
+import ch.dissem.bitmessage.exception.NodeException;
+import ch.dissem.bitmessage.ports.*;
 import ch.dissem.bitmessage.utils.Property;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.net.InetAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
 import java.util.concurrent.Future;
 
 import static ch.dissem.bitmessage.utils.Singleton.cryptography;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
@@ -85,6 +79,23 @@ public class NetworkHandlerTest {
                 .networkHandler(networkHandler)
                 .cryptography(new BouncyCryptography())
                 .listener(mock(BitmessageContext.Listener.class))
+                .customCommandHandler(new CustomCommandHandler() {
+                    @Override
+                    public MessagePayload handle(CustomMessage request) {
+                        byte[] data = request.getData();
+                        if (data.length > 0) {
+                            switch (data[0]) {
+                                case 0:
+                                    return null;
+                                case 1:
+                                    break;
+                                case 3:
+                                    data[0] = 0;
+                            }
+                        }
+                        return new CustomMessage("test response", request.getData());
+                    }
+                })
                 .build();
     }
 
@@ -118,28 +129,37 @@ public class NetworkHandlerTest {
         }
     }
 
-    @Test
+    @Test(timeout = 5_000)
     public void ensureCustomMessageIsSentAndResponseRetrieved() throws Exception {
-        final CustomMessage request = new CustomMessage("test request", cryptography().randomBytes(8));
-        try (TestServer server = new TestServer(new TestServer.ConnectionTester() {
-            @Override
-            public void test(InputStream in, OutputStream out) throws Exception {
-                NetworkMessage message = Factory.getNetworkMessage(3, in);
-                assertThat(message, notNullValue());
-                assertThat(message.getPayload(), instanceOf(CustomMessage.class));
-                CustomMessage payload = (CustomMessage) message.getPayload();
-                assertThat(payload.getCustomCommand(), is("test request"));
-                assertThat(payload.getData(), is(request.getData()));
-                new NetworkMessage(new CustomMessage("test response", payload.getData())).write(out);
-            }
-        })) {
-            CustomMessage response = networkHandler.send(InetAddress.getLocalHost(), server.getPort(), request);
+        byte[] data = cryptography().randomBytes(8);
+        data[0] = (byte) 1;
+        CustomMessage request = new CustomMessage("test request", data);
+        node.startup();
+
+        CustomMessage response = networkHandler.send(InetAddress.getLocalHost(), 6002, request);
+
+        assertThat(response, notNullValue());
+        assertThat(response.getCustomCommand(), is("test response"));
+        assertThat(response.getData(), is(data));
+
+        shutdown(node);
+    }
+
+    @Test(timeout = 5_000, expected = NodeException.class)
+    public void ensureCustomMessageWithoutResponsYieldsException() throws Exception {
+        try {
+            byte[] data = cryptography().randomBytes(8);
+            data[0] = (byte) 0;
+            CustomMessage request = new CustomMessage("test request", data);
+            node.startup();
+
+            CustomMessage response = networkHandler.send(InetAddress.getLocalHost(), 6002, request);
+
             assertThat(response, notNullValue());
             assertThat(response.getCustomCommand(), is("test response"));
             assertThat(response.getData(), is(request.getData()));
-            if (server.getException() != null) {
-                throw server.getException();
-            }
+        } finally {
+            shutdown(node);
         }
     }
 
@@ -204,42 +224,4 @@ public class NetworkHandlerTest {
         assertEquals(expected, inventory.getInventory().size());
     }
 
-    private static class TestServer implements AutoCloseable {
-        private final ServerSocket socket;
-        private Exception exception;
-
-        private TestServer(final ConnectionTester tester) throws Exception {
-            socket = new ServerSocket(0);
-            new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    while (!socket.isClosed()) {
-                        try {
-                            Socket connection = socket.accept();
-                            tester.test(connection.getInputStream(), connection.getOutputStream());
-                        } catch (Exception e) {
-                            exception = e;
-                        }
-                    }
-                }
-            }).start();
-        }
-
-        int getPort() {
-            return socket.getLocalPort();
-        }
-
-        public Exception getException() {
-            return exception;
-        }
-
-        @Override
-        public void close() throws Exception {
-            socket.close();
-        }
-
-        private interface ConnectionTester {
-            void test(InputStream in, OutputStream out) throws Exception;
-        }
-    }
 }

From 08f2d5d6f112cccc997d43aeae798eea397ec61e Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Sat, 28 May 2016 10:22:47 +0200
Subject: [PATCH 51/87] Added write(ByteBuffer) to Streamable interface and a
 first draft for a NioNetworkHandler

---
 .../ch/dissem/bitmessage/entity/Addr.java     |  15 +-
 .../bitmessage/entity/CustomMessage.java      |  12 ++
 .../ch/dissem/bitmessage/entity/GetData.java  |   9 ++
 .../java/ch/dissem/bitmessage/entity/Inv.java |   9 ++
 .../bitmessage/entity/NetworkMessage.java     |  39 ++++-
 .../bitmessage/entity/ObjectMessage.java      |  11 ++
 .../dissem/bitmessage/entity/Plaintext.java   |  38 +++++
 .../dissem/bitmessage/entity/Streamable.java  |   3 +
 .../ch/dissem/bitmessage/entity/VerAck.java   |   6 +
 .../ch/dissem/bitmessage/entity/Version.java  |  13 ++
 .../bitmessage/entity/payload/CryptoBox.java  |  18 +++
 .../entity/payload/GenericPayload.java        |   6 +
 .../bitmessage/entity/payload/GetPubkey.java  |   6 +
 .../dissem/bitmessage/entity/payload/Msg.java |   7 +
 .../bitmessage/entity/payload/Pubkey.java     |   5 +
 .../bitmessage/entity/payload/V2Pubkey.java   |  16 +-
 .../entity/payload/V4Broadcast.java           |   6 +
 .../bitmessage/entity/payload/V4Pubkey.java   |  12 ++
 .../entity/valueobject/InventoryVector.java   |  10 +-
 .../entity/valueobject/NetworkAddress.java    |  28 +++-
 .../entity/valueobject/PrivateKey.java        |  47 ++++--
 .../bitmessage/ports/NetworkHandler.java      |   2 +
 .../ch/dissem/bitmessage/utils/Encode.java    | 115 +++++++++-----
 .../extensions/pow/ProofOfWorkRequest.java    |   8 +
 .../networking/DefaultNetworkHandler.java     |   1 -
 .../networking/nio/ConnectionInfo.java        |  51 ++++++
 .../networking/nio/NioNetworkHandler.java     | 147 ++++++++++++++++++
 27 files changed, 561 insertions(+), 79 deletions(-)
 create mode 100644 networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
 create mode 100644 networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java

diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Addr.java b/core/src/main/java/ch/dissem/bitmessage/entity/Addr.java
index 6125910..73d9995 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Addr.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Addr.java
@@ -21,6 +21,7 @@ import ch.dissem.bitmessage.utils.Encode;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -47,10 +48,18 @@ public class Addr implements MessagePayload {
     }
 
     @Override
-    public void write(OutputStream stream) throws IOException {
-        Encode.varInt(addresses.size(), stream);
+    public void write(OutputStream out) throws IOException {
+        Encode.varInt(addresses.size(), out);
         for (NetworkAddress address : addresses) {
-            address.write(stream);
+            address.write(out);
+        }
+    }
+
+    @Override
+    public void write(ByteBuffer buffer) {
+        Encode.varInt(addresses.size(), buffer);
+        for (NetworkAddress address : addresses) {
+            address.write(buffer);
         }
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java
index e43f56d..439f003 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/CustomMessage.java
@@ -21,6 +21,7 @@ import ch.dissem.bitmessage.utils.AccessCounter;
 import ch.dissem.bitmessage.utils.Encode;
 
 import java.io.*;
+import java.nio.ByteBuffer;
 
 import static ch.dissem.bitmessage.utils.Decode.bytes;
 import static ch.dissem.bitmessage.utils.Decode.varString;
@@ -85,6 +86,17 @@ public class CustomMessage implements MessagePayload {
         }
     }
 
+    @Override
+    public void write(ByteBuffer buffer) {
+        if (data != null) {
+            Encode.varString(command, buffer);
+            buffer.put(data);
+        } else {
+            throw new ApplicationException("Tried to write custom message without data. " +
+                    "Programmer: did you forget to override #write()?");
+        }
+    }
+
     public boolean isError() {
         return COMMAND_ERROR.equals(command);
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/GetData.java b/core/src/main/java/ch/dissem/bitmessage/entity/GetData.java
index 44fab5b..7d14fa0 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/GetData.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/GetData.java
@@ -21,6 +21,7 @@ import ch.dissem.bitmessage.utils.Encode;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -55,6 +56,14 @@ public class GetData implements MessagePayload {
         }
     }
 
+    @Override
+    public void write(ByteBuffer buffer) {
+        Encode.varInt(inventory.size(), buffer);
+        for (InventoryVector iv : inventory) {
+            iv.write(buffer);
+        }
+    }
+
     public static final class Builder {
         private List<InventoryVector> inventory = new LinkedList<>();
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Inv.java b/core/src/main/java/ch/dissem/bitmessage/entity/Inv.java
index fd2d40d..8d0f592 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Inv.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Inv.java
@@ -21,6 +21,7 @@ import ch.dissem.bitmessage.utils.Encode;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -53,6 +54,14 @@ public class Inv implements MessagePayload {
         }
     }
 
+    @Override
+    public void write(ByteBuffer buffer) {
+        Encode.varInt(inventory.size(), buffer);
+        for (InventoryVector iv : inventory) {
+            iv.write(buffer);
+        }
+    }
+
     public static final class Builder {
         private List<InventoryVector> inventory = new LinkedList<>();
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
index 860c6ed..e549101 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
@@ -22,6 +22,7 @@ import ch.dissem.bitmessage.utils.Encode;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.security.GeneralSecurityException;
 import java.security.NoSuchAlgorithmException;
@@ -74,9 +75,7 @@ public class NetworkMessage implements Streamable {
             out.write('\0');
         }
 
-        ByteArrayOutputStream payloadStream = new ByteArrayOutputStream();
-        payload.write(payloadStream);
-        byte[] payloadBytes = payloadStream.toByteArray();
+        byte[] payloadBytes = Encode.bytes(payload);
 
         // Length of payload in number of bytes. Because of other restrictions, there is no reason why this length would
         // ever be larger than 1600003 bytes. Some clients include a sanity-check to avoid processing messages which are
@@ -93,4 +92,38 @@ public class NetworkMessage implements Streamable {
         // message payload
         out.write(payloadBytes);
     }
+
+    @Override
+    public void write(ByteBuffer out) {
+        // magic
+        Encode.int32(MAGIC, out);
+
+        // ASCII string identifying the packet content, NULL padded (non-NULL padding results in packet rejected)
+        String command = payload.getCommand().name().toLowerCase();
+        try {
+            out.put(command.getBytes("ASCII"));
+        } catch (UnsupportedEncodingException e) {
+            throw new ApplicationException(e);
+        }
+        for (int i = command.length(); i < 12; i++) {
+            out.put((byte) 0);
+        }
+
+        byte[] payloadBytes = Encode.bytes(payload);
+
+        // Length of payload in number of bytes. Because of other restrictions, there is no reason why this length would
+        // ever be larger than 1600003 bytes. Some clients include a sanity-check to avoid processing messages which are
+        // larger than this.
+        Encode.int32(payloadBytes.length, out);
+
+        // checksum
+        try {
+            out.put(getChecksum(payloadBytes));
+        } catch (GeneralSecurityException e) {
+            throw new ApplicationException(e);
+        }
+
+        // message payload
+        out.put(payloadBytes);
+    }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
index 6f74257..fee761c 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/ObjectMessage.java
@@ -29,6 +29,7 @@ import ch.dissem.bitmessage.utils.Encode;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.Objects;
 
@@ -168,6 +169,16 @@ public class ObjectMessage implements MessagePayload {
         out.write(getPayloadBytesWithoutNonce());
     }
 
+    @Override
+    public void write(ByteBuffer buffer) {
+        if (nonce == null) {
+            buffer.put(new byte[8]);
+        } else {
+            buffer.put(nonce);
+        }
+        buffer.put(getPayloadBytesWithoutNonce());
+    }
+
     private void writeHeaderWithoutNonce(OutputStream out) throws IOException {
         Encode.int64(expiresTime, out);
         Encode.int32(objectType, out);
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
index 4bfaba4..242eb95 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
@@ -25,6 +25,7 @@ import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.utils.*;
 
 import java.io.*;
+import java.nio.ByteBuffer;
 import java.util.*;
 import java.util.Collections;
 
@@ -197,12 +198,49 @@ public class Plaintext implements Streamable {
             }
         }
     }
+    public void write(ByteBuffer buffer, boolean includeSignature) {
+        Encode.varInt(from.getVersion(), buffer);
+        Encode.varInt(from.getStream(), buffer);
+        Encode.int32(from.getPubkey().getBehaviorBitfield(), buffer);
+        buffer.put(from.getPubkey().getSigningKey(), 1, 64);
+        buffer.put(from.getPubkey().getEncryptionKey(), 1, 64);
+        if (from.getVersion() >= 3) {
+            Encode.varInt(from.getPubkey().getNonceTrialsPerByte(), buffer);
+            Encode.varInt(from.getPubkey().getExtraBytes(), buffer);
+        }
+        if (type == Type.MSG) {
+            buffer.put(to.getRipe());
+        }
+        Encode.varInt(encoding, buffer);
+        Encode.varInt(message.length, buffer);
+        buffer.put(message);
+        if (type == Type.MSG) {
+            if (to.has(Feature.DOES_ACK) && getAckMessage() != null) {
+                Encode.varBytes(Encode.bytes(getAckMessage()), buffer);
+            } else {
+                Encode.varInt(0, buffer);
+            }
+        }
+        if (includeSignature) {
+            if (signature == null) {
+                Encode.varInt(0, buffer);
+            } else {
+                Encode.varInt(signature.length, buffer);
+                buffer.put(signature);
+            }
+        }
+    }
 
     @Override
     public void write(OutputStream out) throws IOException {
         write(out, true);
     }
 
+    @Override
+    public void write(ByteBuffer buffer) {
+        write(buffer, true);
+    }
+
     public Object getId() {
         return id;
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Streamable.java b/core/src/main/java/ch/dissem/bitmessage/entity/Streamable.java
index cc12050..e75a926 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Streamable.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Streamable.java
@@ -19,10 +19,13 @@ package ch.dissem.bitmessage.entity;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Serializable;
+import java.nio.ByteBuffer;
 
 /**
  * An object that can be written to an {@link OutputStream}
  */
 public interface Streamable extends Serializable {
     void write(OutputStream stream) throws IOException;
+
+    void write(ByteBuffer buffer);
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/VerAck.java b/core/src/main/java/ch/dissem/bitmessage/entity/VerAck.java
index 815a20f..3d30f32 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/VerAck.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/VerAck.java
@@ -18,6 +18,7 @@ package ch.dissem.bitmessage.entity;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 
 /**
  * The 'verack' command answers a 'version' command, accepting the other node's version.
@@ -34,4 +35,9 @@ public class VerAck implements MessagePayload {
     public void write(OutputStream stream) throws IOException {
         // 'verack' doesn't have any payload, so there is nothing to write
     }
+
+    @Override
+    public void write(ByteBuffer buffer) {
+        // 'verack' doesn't have any payload, so there is nothing to write
+    }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Version.java b/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
index 8539be1..48022c4 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
@@ -23,6 +23,7 @@ import ch.dissem.bitmessage.utils.UnixTime;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 import java.util.Random;
 
 /**
@@ -134,6 +135,18 @@ public class Version implements MessagePayload {
         Encode.varIntList(streams, stream);
     }
 
+    @Override
+    public void write(ByteBuffer buffer) {
+        Encode.int32(version, buffer);
+        Encode.int64(services, buffer);
+        Encode.int64(timestamp, buffer);
+        addrRecv.write(buffer, true);
+        addrFrom.write(buffer, true);
+        Encode.int64(nonce, buffer);
+        Encode.varString(userAgent, buffer);
+        Encode.varIntList(streams, buffer);
+    }
+
 
     public static final class Builder {
         private int version;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
index 89d7bd7..f7f3c15 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/CryptoBox.java
@@ -24,6 +24,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
+import java.nio.ByteBuffer;
 import java.util.Arrays;
 
 import static ch.dissem.bitmessage.entity.valueobject.PrivateKey.PRIVATE_KEY_SIZE;
@@ -144,12 +145,29 @@ public class CryptoBox implements Streamable {
         out.write(x, offset, length);
     }
 
+    private void writeCoordinateComponent(ByteBuffer buffer, byte[] x) {
+        int offset = Bytes.numberOfLeadingZeros(x);
+        int length = x.length - offset;
+        Encode.int16(length, buffer);
+        buffer.put(x, offset, length);
+    }
+
     @Override
     public void write(OutputStream stream) throws IOException {
         writeWithoutMAC(stream);
         stream.write(mac);
     }
 
+    @Override
+    public void write(ByteBuffer buffer) {
+        buffer.put(initializationVector);
+        Encode.int16(curveType, buffer);
+        writeCoordinateComponent(buffer, Points.getX(R));
+        writeCoordinateComponent(buffer, Points.getY(R));
+        buffer.put(encrypted);
+        buffer.put(mac);
+    }
+
     public static final class Builder {
         private byte[] initializationVector;
         private int curveType;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
index 176d938..9312160 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/GenericPayload.java
@@ -21,6 +21,7 @@ import ch.dissem.bitmessage.utils.Decode;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 import java.util.Arrays;
 
 /**
@@ -62,6 +63,11 @@ public class GenericPayload extends ObjectPayload {
         stream.write(data);
     }
 
+    @Override
+    public void write(ByteBuffer buffer) {
+        buffer.put(data);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/GetPubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/GetPubkey.java
index 06e623a..d889489 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/GetPubkey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/GetPubkey.java
@@ -22,6 +22,7 @@ import ch.dissem.bitmessage.utils.Decode;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 
 /**
  * Request for a public key.
@@ -73,4 +74,9 @@ public class GetPubkey extends ObjectPayload {
     public void write(OutputStream stream) throws IOException {
         stream.write(ripeTag);
     }
+
+    @Override
+    public void write(ByteBuffer buffer) {
+        buffer.put(ripeTag);
+    }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
index 64a010c..dc36bb1 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Msg.java
@@ -24,6 +24,7 @@ import ch.dissem.bitmessage.exception.DecryptionFailedException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 import java.util.Objects;
 
 import static ch.dissem.bitmessage.entity.Plaintext.Type.MSG;
@@ -111,6 +112,12 @@ public class Msg extends ObjectPayload implements Encrypted, PlaintextHolder {
         encrypted.write(out);
     }
 
+    @Override
+    public void write(ByteBuffer buffer) {
+        if (encrypted == null) throw new IllegalStateException("Msg must be signed and encrypted before writing it.");
+        encrypted.write(buffer);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
index c476bf9..27d2da9 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/Pubkey.java
@@ -18,6 +18,7 @@ package ch.dissem.bitmessage.entity.payload;
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 
 import static ch.dissem.bitmessage.utils.Singleton.cryptography;
@@ -60,6 +61,10 @@ public abstract class Pubkey extends ObjectPayload {
         write(out);
     }
 
+    public void writeUnencrypted(ByteBuffer buffer){
+        write(buffer);
+    }
+
     protected byte[] add0x04(byte[] key) {
         if (key.length == 65) return key;
         byte[] result = new byte[65];
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java
index 0eceb91..d2901c1 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V2Pubkey.java
@@ -22,6 +22,7 @@ import ch.dissem.bitmessage.utils.Encode;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 
 /**
  * A version 2 public key.
@@ -86,10 +87,17 @@ public class V2Pubkey extends Pubkey {
     }
 
     @Override
-    public void write(OutputStream os) throws IOException {
-        Encode.int32(behaviorBitfield, os);
-        os.write(publicSigningKey, 1, 64);
-        os.write(publicEncryptionKey, 1, 64);
+    public void write(OutputStream out) throws IOException {
+        Encode.int32(behaviorBitfield, out);
+        out.write(publicSigningKey, 1, 64);
+        out.write(publicEncryptionKey, 1, 64);
+    }
+
+    @Override
+    public void write(ByteBuffer buffer) {
+        Encode.int32(behaviorBitfield, buffer);
+        buffer.put(publicSigningKey, 1, 64);
+        buffer.put(publicEncryptionKey, 1, 64);
     }
 
     public static class Builder {
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Broadcast.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Broadcast.java
index 7781455..323da33 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Broadcast.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Broadcast.java
@@ -22,6 +22,7 @@ import ch.dissem.bitmessage.entity.Plaintext;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 
 /**
  * Users who are subscribed to the sending address will see the message appear in their inbox.
@@ -58,4 +59,9 @@ public class V4Broadcast extends Broadcast {
     public void write(OutputStream out) throws IOException {
         encrypted.write(out);
     }
+
+    @Override
+    public void write(ByteBuffer buffer) {
+        encrypted.write(buffer);
+    }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Pubkey.java b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Pubkey.java
index 8aa0ee4..179a475 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Pubkey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/payload/V4Pubkey.java
@@ -24,6 +24,7 @@ import ch.dissem.bitmessage.utils.Decode;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 import java.util.Arrays;
 
 /**
@@ -85,11 +86,22 @@ public class V4Pubkey extends Pubkey implements Encrypted {
         encrypted.write(stream);
     }
 
+    @Override
+    public void write(ByteBuffer buffer) {
+        buffer.put(tag);
+        encrypted.write(buffer);
+    }
+
     @Override
     public void writeUnencrypted(OutputStream out) throws IOException {
         decrypted.write(out);
     }
 
+    @Override
+    public void writeUnencrypted(ByteBuffer buffer) {
+        decrypted.write(buffer);
+    }
+
     @Override
     public void writeBytesToSign(OutputStream out) throws IOException {
         out.write(tag);
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/InventoryVector.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/InventoryVector.java
index 127b90a..9a3b258 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/InventoryVector.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/InventoryVector.java
@@ -22,6 +22,7 @@ import ch.dissem.bitmessage.utils.Strings;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Serializable;
+import java.nio.ByteBuffer;
 import java.util.Arrays;
 
 public class InventoryVector implements Streamable, Serializable {
@@ -56,8 +57,13 @@ public class InventoryVector implements Streamable, Serializable {
     }
 
     @Override
-    public void write(OutputStream stream) throws IOException {
-        stream.write(hash);
+    public void write(OutputStream out) throws IOException {
+        out.write(hash);
+    }
+
+    @Override
+    public void write(ByteBuffer buffer) {
+        buffer.put(hash);
     }
 
     @Override
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
index d0324a4..0fef152 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
@@ -25,6 +25,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.nio.ByteBuffer;
 import java.util.Arrays;
 
 /**
@@ -119,14 +120,29 @@ public class NetworkAddress implements Streamable {
         write(stream, false);
     }
 
-    public void write(OutputStream stream, boolean light) throws IOException {
+    public void write(OutputStream out, boolean light) throws IOException {
         if (!light) {
-            Encode.int64(time, stream);
-            Encode.int32(this.stream, stream);
+            Encode.int64(time, out);
+            Encode.int32(stream, out);
         }
-        Encode.int64(services, stream);
-        stream.write(ipv6);
-        Encode.int16(port, stream);
+        Encode.int64(services, out);
+        out.write(ipv6);
+        Encode.int16(port, out);
+    }
+
+    @Override
+    public void write(ByteBuffer buffer) {
+        write(buffer, false);
+    }
+
+    public void write(ByteBuffer buffer, boolean light) {
+        if (!light) {
+            Encode.int64(time, buffer);
+            Encode.int32(stream, buffer);
+        }
+        Encode.int64(services, buffer);
+        buffer.put(ipv6);
+        Encode.int16(port, buffer);
     }
 
     public static final class Builder {
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
index 716afc6..7621ca5 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/PrivateKey.java
@@ -27,6 +27,7 @@ import ch.dissem.bitmessage.utils.Decode;
 import ch.dissem.bitmessage.utils.Encode;
 
 import java.io.*;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -113,24 +114,20 @@ public class PrivateKey implements Streamable {
         }
 
         Builder generate() {
-            try {
-                long signingKeyNonce = nextNonce;
-                long encryptionKeyNonce = nextNonce + 1;
-                byte[] ripe;
-                do {
-                    privEK = Bytes.truncate(cryptography().sha512(seed, Encode.varInt(encryptionKeyNonce)), 32);
-                    privSK = Bytes.truncate(cryptography().sha512(seed, Encode.varInt(signingKeyNonce)), 32);
-                    pubSK = cryptography().createPublicKey(privSK);
-                    pubEK = cryptography().createPublicKey(privEK);
-                    ripe = cryptography().ripemd160(cryptography().sha512(pubSK, pubEK));
+            long signingKeyNonce = nextNonce;
+            long encryptionKeyNonce = nextNonce + 1;
+            byte[] ripe;
+            do {
+                privEK = Bytes.truncate(cryptography().sha512(seed, Encode.varInt(encryptionKeyNonce)), 32);
+                privSK = Bytes.truncate(cryptography().sha512(seed, Encode.varInt(signingKeyNonce)), 32);
+                pubSK = cryptography().createPublicKey(privSK);
+                pubEK = cryptography().createPublicKey(privEK);
+                ripe = cryptography().ripemd160(cryptography().sha512(pubSK, pubEK));
 
-                    signingKeyNonce += 2;
-                    encryptionKeyNonce += 2;
-                } while (ripe[0] != 0 || (shorter && ripe[1] != 0));
-                nextNonce = signingKeyNonce;
-            } catch (IOException e) {
-                throw new ApplicationException(e);
-            }
+                signingKeyNonce += 2;
+                encryptionKeyNonce += 2;
+            } while (ripe[0] != 0 || (shorter && ripe[1] != 0));
+            nextNonce = signingKeyNonce;
             return this;
         }
     }
@@ -182,4 +179,20 @@ public class PrivateKey implements Streamable {
         Encode.varInt(privateEncryptionKey.length, out);
         out.write(privateEncryptionKey);
     }
+
+
+    @Override
+    public void write(ByteBuffer buffer) {
+        Encode.varInt(pubkey.getVersion(), buffer);
+        Encode.varInt(pubkey.getStream(), buffer);
+        try {
+            ByteArrayOutputStream baos = new ByteArrayOutputStream();
+            pubkey.writeUnencrypted(baos);
+            Encode.varBytes(baos.toByteArray(), buffer);
+        } catch (IOException e) {
+            throw new ApplicationException(e);
+        }
+        Encode.varBytes(privateSigningKey, buffer);
+        Encode.varBytes(privateEncryptionKey, buffer);
+    }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java b/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
index 909d3dd..bfbb48c 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
@@ -29,6 +29,8 @@ import java.util.concurrent.Future;
  * Handles incoming messages
  */
 public interface NetworkHandler {
+    int NETWORK_MAGIC_NUMBER = 8;
+
     /**
      * Connects to the trusted host, fetches and offers new messages and disconnects afterwards.
      * <p>
diff --git a/core/src/main/java/ch/dissem/bitmessage/utils/Encode.java b/core/src/main/java/ch/dissem/bitmessage/utils/Encode.java
index f5eac43..a60c027 100644
--- a/core/src/main/java/ch/dissem/bitmessage/utils/Encode.java
+++ b/core/src/main/java/ch/dissem/bitmessage/utils/Encode.java
@@ -17,10 +17,13 @@
 package ch.dissem.bitmessage.utils;
 
 import ch.dissem.bitmessage.entity.Streamable;
+import ch.dissem.bitmessage.exception.ApplicationException;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.nio.Buffer;
 import java.nio.ByteBuffer;
 
 import static ch.dissem.bitmessage.utils.AccessCounter.inc;
@@ -37,62 +40,52 @@ public class Encode {
         }
     }
 
+    public static void varIntList(long[] values, ByteBuffer buffer) {
+        varInt(values.length, buffer);
+        for (long value : values) {
+            varInt(value, buffer);
+        }
+    }
+
     public static void varInt(long value, OutputStream stream) throws IOException {
         varInt(value, stream, null);
     }
 
-    public static byte[] varInt(long value) throws IOException {
-        final byte[] result;
+    public static void varInt(long value, ByteBuffer buffer) {
         if (value < 0) {
             // This is due to the fact that Java doesn't really support unsigned values.
             // Please be aware that this might be an error due to a smaller negative value being cast to long.
-            // Normally, negative values shouldn't occur within the protocol, and I large enough longs
-            // to being recognized as negatives aren't realistic.
-            ByteBuffer buffer = ByteBuffer.allocate(9);
+            // Normally, negative values shouldn't occur within the protocol, and longs large enough for being
+            // recognized as negatives aren't realistic.
             buffer.put((byte) 0xff);
-            result = buffer.putLong(value).array();
+            buffer.putLong(value);
         } else if (value < 0xfd) {
-            result = new byte[]{(byte) value};
+            buffer.put((byte) value);
         } else if (value <= 0xffffL) {
-            ByteBuffer buffer = ByteBuffer.allocate(3);
             buffer.put((byte) 0xfd);
-            result = buffer.putShort((short) value).array();
+            buffer.putShort((short) value);
         } else if (value <= 0xffffffffL) {
-            ByteBuffer buffer = ByteBuffer.allocate(5);
             buffer.put((byte) 0xfe);
-            result = buffer.putInt((int) value).array();
+            buffer.putInt((int) value);
         } else {
-            ByteBuffer buffer = ByteBuffer.allocate(9);
             buffer.put((byte) 0xff);
-            result = buffer.putLong(value).array();
+            buffer.putLong(value);
         }
-        return result;
+    }
+
+    public static byte[] varInt(long value) {
+        ByteBuffer buffer = ByteBuffer.allocate(9);
+        varInt(value, buffer);
+        buffer.flip();
+        return Bytes.truncate(buffer.array(), buffer.limit());
     }
 
     public static void varInt(long value, OutputStream stream, AccessCounter counter) throws IOException {
-        if (value < 0) {
-            // This is due to the fact that Java doesn't really support unsigned values.
-            // Please be aware that this might be an error due to a smaller negative value being cast to long.
-            // Normally, negative values shouldn't occur within the protocol, and I large enough longs
-            // to being recognized as negatives aren't realistic.
-            stream.write(0xff);
-            inc(counter);
-            int64(value, stream, counter);
-        } else if (value < 0xfd) {
-            int8(value, stream, counter);
-        } else if (value <= 0xffffL) {
-            stream.write(0xfd);
-            inc(counter);
-            int16(value, stream, counter);
-        } else if (value <= 0xffffffffL) {
-            stream.write(0xfe);
-            inc(counter);
-            int32(value, stream, counter);
-        } else {
-            stream.write(0xff);
-            inc(counter);
-            int64(value, stream, counter);
-        }
+        ByteBuffer buffer = ByteBuffer.allocate(9);
+        varInt(value, buffer);
+        buffer.flip();
+        stream.write(buffer.array(), 0, buffer.limit());
+        inc(counter, buffer.limit());
     }
 
     public static void int8(long value, OutputStream stream) throws IOException {
@@ -113,6 +106,10 @@ public class Encode {
         inc(counter, 2);
     }
 
+    public static void int16(long value, ByteBuffer buffer) {
+        buffer.putShort((short) value);
+    }
+
     public static void int32(long value, OutputStream stream) throws IOException {
         int32(value, stream, null);
     }
@@ -122,6 +119,10 @@ public class Encode {
         inc(counter, 4);
     }
 
+    public static void int32(long value, ByteBuffer buffer) {
+        buffer.putInt((int) value);
+    }
+
     public static void int64(long value, OutputStream stream) throws IOException {
         int64(value, stream, null);
     }
@@ -131,6 +132,10 @@ public class Encode {
         inc(counter, 8);
     }
 
+    public static void int64(long value, ByteBuffer buffer) {
+        buffer.putLong(value);
+    }
+
     public static void varString(String value, OutputStream out) throws IOException {
         byte[] bytes = value.getBytes("utf-8");
         // Technically, it says the length in characters, but I think this one might be correct.
@@ -140,23 +145,44 @@ public class Encode {
         out.write(bytes);
     }
 
+    public static void varString(String value, ByteBuffer buffer) {
+        try {
+            byte[] bytes = value.getBytes("utf-8");
+            // Technically, it says the length in characters, but I think this one might be correct.
+            // It doesn't really matter, as only ASCII characters are being used.
+            // see also Decode#varString()
+            buffer.put(varInt(bytes.length));
+            buffer.put(bytes);
+        } catch (UnsupportedEncodingException e) {
+            throw new ApplicationException(e);
+        }
+    }
+
     public static void varBytes(byte[] data, OutputStream out) throws IOException {
         varInt(data.length, out);
         out.write(data);
     }
 
+    public static void varBytes(byte[] data, ByteBuffer buffer) {
+        varInt(data.length, buffer);
+        buffer.put(data);
+    }
+
     /**
      * Serializes a {@link Streamable} object and returns the byte array.
      *
      * @param streamable the object to be serialized
      * @return an array of bytes representing the given streamable object.
-     * @throws IOException if an I/O error occurs.
      */
-    public static byte[] bytes(Streamable streamable) throws IOException {
+    public static byte[] bytes(Streamable streamable) {
         if (streamable == null) return null;
 
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        streamable.write(stream);
+        try {
+            streamable.write(stream);
+        } catch (IOException e) {
+            throw new ApplicationException(e);
+        }
         return stream.toByteArray();
     }
 
@@ -164,11 +190,14 @@ public class Encode {
      * @param streamable the object to be serialized
      * @param padding    the result will be padded such that its length is a multiple of <em>padding</em>
      * @return the bytes of the given {@link Streamable} object, 0-padded such that the final length is x*padding.
-     * @throws IOException if an I/O error occurs.
      */
-    public static byte[] bytes(Streamable streamable, int padding) throws IOException {
+    public static byte[] bytes(Streamable streamable, int padding) {
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
-        streamable.write(stream);
+        try {
+            streamable.write(stream);
+        } catch (IOException e) {
+            throw new ApplicationException(e);
+        }
         int offset = padding - stream.size() % padding;
         int length = stream.size() + offset;
         byte[] result = new byte[length];
diff --git a/extensions/src/main/java/ch/dissem/bitmessage/extensions/pow/ProofOfWorkRequest.java b/extensions/src/main/java/ch/dissem/bitmessage/extensions/pow/ProofOfWorkRequest.java
index d661c50..e5ba4f8 100644
--- a/extensions/src/main/java/ch/dissem/bitmessage/extensions/pow/ProofOfWorkRequest.java
+++ b/extensions/src/main/java/ch/dissem/bitmessage/extensions/pow/ProofOfWorkRequest.java
@@ -24,6 +24,7 @@ import ch.dissem.bitmessage.utils.Encode;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.ByteBuffer;
 import java.util.Arrays;
 
 import static ch.dissem.bitmessage.utils.Decode.*;
@@ -83,6 +84,13 @@ public class ProofOfWorkRequest implements Streamable {
         Encode.varBytes(data, out);
     }
 
+    @Override
+    public void write(ByteBuffer buffer) {
+        buffer.put(initialHash);
+        Encode.varString(request.name(), buffer);
+        Encode.varBytes(data, buffer);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
index 635aed2..2b06373 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
@@ -45,7 +45,6 @@ import static java.util.Collections.newSetFromMap;
  * Handles all the networky stuff.
  */
 public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
-    public final static int NETWORK_MAGIC_NUMBER = 8;
 
     final Collection<Connection> connections = new ConcurrentLinkedQueue<>();
     private final ExecutorService pool = Executors.newCachedThreadPool(
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
new file mode 100644
index 0000000..3361693
--- /dev/null
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.networking.nio;
+
+import ch.dissem.bitmessage.entity.MessagePayload;
+
+import java.nio.ByteBuffer;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedDeque;
+
+/**
+ * Created by chrig on 27.05.2016.
+ */
+public class ConnectionInfo {
+    private State state;
+    private final Queue<MessagePayload> sendingQueue = new ConcurrentLinkedDeque<>();
+    private ByteBuffer in = ByteBuffer.allocate(10);
+    private ByteBuffer out = ByteBuffer.allocate(10);
+
+    public State getState() {
+        return state;
+    }
+
+    public Queue<MessagePayload> getSendingQueue() {
+        return sendingQueue;
+    }
+
+    public ByteBuffer getInBuffer() {
+        return in;
+    }
+
+    public ByteBuffer getOutBuffer() {
+        return out;
+    }
+
+    public enum State {CONNECTING, ACTIVE, DISCONNECTED}
+}
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
new file mode 100644
index 0000000..4f56d42
--- /dev/null
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.networking.nio;
+
+import ch.dissem.bitmessage.InternalContext;
+import ch.dissem.bitmessage.entity.CustomMessage;
+import ch.dissem.bitmessage.entity.GetData;
+import ch.dissem.bitmessage.entity.MessagePayload;
+import ch.dissem.bitmessage.entity.NetworkMessage;
+import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
+import ch.dissem.bitmessage.exception.ApplicationException;
+import ch.dissem.bitmessage.ports.NetworkHandler;
+import ch.dissem.bitmessage.utils.Property;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+import java.util.concurrent.Future;
+
+import static java.nio.channels.SelectionKey.*;
+
+/**
+ * Network handler using java.nio, resulting in less threads.
+ */
+public class NioNetworkHandler implements NetworkHandler, InternalContext.ContextHolder {
+    private static final Logger LOG = LoggerFactory.getLogger(NioNetworkHandler.class);
+
+    private InternalContext ctx;
+    private Selector selector;
+
+    @Override
+    public Future<?> synchronize(InetAddress server, int port, MessageListener listener, long timeoutInSeconds) {
+        return null;
+    }
+
+    @Override
+    public CustomMessage send(InetAddress server, int port, CustomMessage request) {
+        return null;
+    }
+
+    @Override
+    public void start(MessageListener listener) {
+        if (listener == null) {
+            throw new IllegalStateException("Listener must be set at start");
+        }
+        if (selector != null && selector.isOpen()) {
+            throw new IllegalStateException("Network already running - you need to stop first.");
+        }
+        try {
+            final Set<InventoryVector> requestedObjects = new HashSet<>();
+            selector = Selector.open();
+            {
+                ServerSocketChannel server = ServerSocketChannel.open();
+                server.configureBlocking(false);
+                server.bind(new InetSocketAddress(ctx.getPort()));
+                server.register(selector, OP_ACCEPT);
+            }
+            while (selector.isOpen()) {
+                // TODO: establish outgoing connections
+                selector.select();
+                Iterator<SelectionKey> keyIterator = selector.selectedKeys().iterator();
+
+                while (keyIterator.hasNext()) {
+                    SelectionKey key = keyIterator.next();
+                    if (key.isAcceptable()) {
+                        SocketChannel accepted = ((ServerSocketChannel) key.channel()).accept();
+                        accepted.configureBlocking(false);
+                        accepted.register(selector, OP_READ | OP_WRITE).attach(new ConnectionInfo());
+                    }
+                    if (key.attachment() instanceof ConnectionInfo) {
+                        SocketChannel channel = (SocketChannel) key.channel();
+                        ConnectionInfo connection = (ConnectionInfo) key.attachment();
+
+                        if (key.isWritable()) {
+                            if (connection.getOutBuffer().hasRemaining()) {
+                                channel.write(connection.getOutBuffer());
+                            }
+                            while (!connection.getOutBuffer().hasRemaining() && !connection.getSendingQueue().isEmpty()) {
+                                MessagePayload payload = connection.getSendingQueue().poll();
+                                if (payload instanceof GetData) {
+                                    requestedObjects.addAll(((GetData) payload).getInventory());
+                                }
+                                new NetworkMessage(payload).write(connection.getOutBuffer());
+                            }
+                        }
+                        if (key.isReadable()) {
+                            // TODO
+                            channel.read(connection.getInBuffer());
+                        }
+                    }
+                    keyIterator.remove();
+                }
+            }
+            selector.close();
+        } catch (IOException e) {
+            throw new ApplicationException(e);
+        }
+    }
+
+    @Override
+    public void stop() {
+
+    }
+
+    @Override
+    public void offer(InventoryVector iv) {
+
+    }
+
+    @Override
+    public Property getNetworkStatus() {
+        return null;
+    }
+
+    @Override
+    public boolean isRunning() {
+        return false;
+    }
+
+    @Override
+    public void setContext(InternalContext context) {
+        this.ctx = context;
+    }
+}

From c1fa642b4eef704f4710a973c613c6fb5effad80 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Sat, 28 May 2016 11:04:47 +0200
Subject: [PATCH 52/87] Made tests more stable, albeit slightly slower

---
 .../networking/NetworkHandlerTest.java        | 71 ++++++++-----------
 .../repository/JdbcMessageRepositoryTest.java |  7 +-
 2 files changed, 34 insertions(+), 44 deletions(-)

diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index 6e4f8d9..3841be3 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -24,9 +24,7 @@ import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
 import ch.dissem.bitmessage.exception.NodeException;
 import ch.dissem.bitmessage.ports.*;
 import ch.dissem.bitmessage.utils.Property;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.*;
 
 import java.net.InetAddress;
 import java.util.concurrent.Future;
@@ -44,15 +42,15 @@ import static org.mockito.Mockito.mock;
 public class NetworkHandlerTest {
     private static NetworkAddress localhost = new NetworkAddress.Builder().ipv4(127, 0, 0, 1).port(6001).build();
 
-    private static TestInventory peerInventory;
-    private static TestInventory nodeInventory;
+    private TestInventory peerInventory;
+    private TestInventory nodeInventory;
 
-    private static BitmessageContext peer;
-    private static BitmessageContext node;
-    private static NetworkHandler networkHandler;
+    private BitmessageContext peer;
+    private BitmessageContext node;
+    private NetworkHandler networkHandler;
 
-    @BeforeClass
-    public static void setUp() {
+    @Before
+    public void setUp() {
         peerInventory = new TestInventory();
         peer = new BitmessageContext.Builder()
                 .addressRepo(mock(AddressRepository.class))
@@ -99,34 +97,33 @@ public class NetworkHandlerTest {
                 .build();
     }
 
-    @AfterClass
-    public static void cleanUp() {
+    @After
+    public void cleanUp() {
         shutdown(peer);
+        shutdown(node);
     }
 
-    private static void shutdown(BitmessageContext node) {
-        node.shutdown();
+    private static void shutdown(BitmessageContext ctx) {
+        if (!ctx.isRunning()) return;
+
+        ctx.shutdown();
         do {
             try {
                 Thread.sleep(100);
             } catch (InterruptedException ignore) {
             }
-        } while (node.isRunning());
+        } while (ctx.isRunning());
     }
 
     @Test(timeout = 5_000)
     public void ensureNodesAreConnecting() {
-        try {
-            node.startup();
-            Property status;
-            do {
-                Thread.yield();
-                status = node.status().getProperty("network", "connections", "stream 0");
-            } while (status == null);
-            assertEquals(1, status.getProperty("outgoing").getValue());
-        } finally {
-            shutdown(node);
-        }
+        node.startup();
+        Property status;
+        do {
+            Thread.yield();
+            status = node.status().getProperty("network", "connections", "stream 0");
+        } while (status == null);
+        assertEquals(1, status.getProperty("outgoing").getValue());
     }
 
     @Test(timeout = 5_000)
@@ -141,26 +138,20 @@ public class NetworkHandlerTest {
         assertThat(response, notNullValue());
         assertThat(response.getCustomCommand(), is("test response"));
         assertThat(response.getData(), is(data));
-
-        shutdown(node);
     }
 
     @Test(timeout = 5_000, expected = NodeException.class)
     public void ensureCustomMessageWithoutResponsYieldsException() throws Exception {
-        try {
-            byte[] data = cryptography().randomBytes(8);
-            data[0] = (byte) 0;
-            CustomMessage request = new CustomMessage("test request", data);
-            node.startup();
+        byte[] data = cryptography().randomBytes(8);
+        data[0] = (byte) 0;
+        CustomMessage request = new CustomMessage("test request", data);
+        node.startup();
 
-            CustomMessage response = networkHandler.send(InetAddress.getLocalHost(), 6002, request);
+        CustomMessage response = networkHandler.send(InetAddress.getLocalHost(), 6002, request);
 
-            assertThat(response, notNullValue());
-            assertThat(response.getCustomCommand(), is("test response"));
-            assertThat(response.getData(), is(request.getData()));
-        } finally {
-            shutdown(node);
-        }
+        assertThat(response, notNullValue());
+        assertThat(response.getCustomCommand(), is("test response"));
+        assertThat(response.getData(), is(request.getData()));
     }
 
     @Test(timeout = 5_000)
diff --git a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
index 5fa88e7..9d9b002 100644
--- a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
+++ b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcMessageRepositoryTest.java
@@ -27,7 +27,6 @@ import ch.dissem.bitmessage.entity.valueobject.PrivateKey;
 import ch.dissem.bitmessage.ports.AddressRepository;
 import ch.dissem.bitmessage.ports.MessageRepository;
 import ch.dissem.bitmessage.utils.UnixTime;
-import org.hamcrest.Matchers;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -212,14 +211,14 @@ public class JdbcMessageRepositoryTest extends TestBase {
                 .to(contactA)
                 .message("Subject", "Message")
                 .status(Plaintext.Status.SENT)
-                .ttl(1)
+                .ttl(2)
                 .build();
         message.updateNextTry();
         assertThat(message.getRetries(), is(1));
         assertThat(message.getNextTry(), greaterThan(UnixTime.now()));
-        assertThat(message.getNextTry(), lessThanOrEqualTo(UnixTime.now(+1)));
+        assertThat(message.getNextTry(), lessThanOrEqualTo(UnixTime.now(+2)));
         repo.save(message);
-        Thread.sleep(2100);
+        Thread.sleep(4100);
         List<Plaintext> messagesToResend = repo.findMessagesToResend();
         assertThat(messagesToResend, hasSize(1));
 

From cde4f7b3ce50e5649b6b60e4fdd644d8bd43a281 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 1 Jun 2016 17:38:49 +0200
Subject: [PATCH 53/87] Some refactoring to move some common code into an
 AbstractConnection

---
 .../entity/valueobject/NetworkAddress.java    |  13 +
 .../bitmessage/factory/V3MessageFactory.java  |   2 +-
 .../bitmessage/factory/V3MessageReader.java   | 143 ++++++++
 .../ports/AbstractCryptography.java           |   6 +
 .../dissem/bitmessage/ports/Cryptography.java |  12 +
 .../bitmessage/ports/NetworkHandler.java      |  10 +
 .../ch/dissem/bitmessage/utils/Decode.java    |   4 +
 .../networking/AbstractConnection.java        | 318 ++++++++++++++++++
 .../bitmessage/networking/Connection.java     | 281 ++--------------
 .../networking/ConnectionOrganizer.java       |   8 +-
 .../networking/DefaultNetworkHandler.java     |  11 +-
 .../bitmessage/networking/ServerRunnable.java |   8 +-
 .../networking/nio/ConnectionInfo.java        |  53 ++-
 .../networking/nio/NioNetworkHandler.java     | 210 +++++++++---
 .../networking/NetworkHandlerTest.java        |   9 +-
 15 files changed, 748 insertions(+), 340 deletions(-)
 create mode 100644 core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
 create mode 100644 networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java

diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
index 0fef152..a496d19 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
@@ -24,6 +24,8 @@ import ch.dissem.bitmessage.utils.UnixTime;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -215,6 +217,17 @@ public class NetworkAddress implements Streamable {
             return this;
         }
 
+        public Builder address(SocketAddress address) {
+            if (address instanceof InetSocketAddress) {
+                InetSocketAddress inetAddress = (InetSocketAddress) address;
+                ip(inetAddress.getAddress());
+                port(inetAddress.getPort());
+            } else {
+                throw new IllegalArgumentException("Unknown type of address: " + address.getClass());
+            }
+            return this;
+        }
+
         public NetworkAddress build() {
             if (time == 0) {
                 time = UnixTime.now();
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java
index af9839f..478d77c 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java
@@ -62,7 +62,7 @@ class V3MessageFactory {
         }
     }
 
-    private static MessagePayload getPayload(String command, InputStream stream, int length) throws IOException {
+    static MessagePayload getPayload(String command, InputStream stream, int length) throws IOException {
         switch (command) {
             case "version":
                 return parseVersion(stream);
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
new file mode 100644
index 0000000..7006cdb
--- /dev/null
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.factory;
+
+import ch.dissem.bitmessage.entity.MessagePayload;
+import ch.dissem.bitmessage.entity.NetworkMessage;
+import ch.dissem.bitmessage.exception.ApplicationException;
+import ch.dissem.bitmessage.exception.NodeException;
+import ch.dissem.bitmessage.utils.Decode;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.nio.ByteBuffer;
+import java.util.LinkedList;
+import java.util.List;
+
+import static ch.dissem.bitmessage.entity.NetworkMessage.MAGIC_BYTES;
+import static ch.dissem.bitmessage.ports.NetworkHandler.MAX_PAYLOAD_SIZE;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
+
+/**
+ * Similar to the {@link V3MessageFactory}, but used for NIO buffers which may or may not contain a whole message.
+ */
+public class V3MessageReader {
+    private ReaderState state = ReaderState.MAGIC;
+    private String command;
+    private int length;
+    private byte[] checksum;
+
+    private List<NetworkMessage> messages = new LinkedList<>();
+
+    public void update(ByteBuffer buffer) {
+        while (buffer.hasRemaining()) {
+            switch (state) {
+                case MAGIC:
+                    if (!findMagicBytes(buffer)) return;
+                    state = ReaderState.HEADER;
+                case HEADER:
+                    if (buffer.remaining() < 20) {
+                        buffer.compact();
+                        return;
+                    }
+                    command = getCommand(buffer);
+                    length = (int) Decode.uint32(buffer);
+                    if (length > MAX_PAYLOAD_SIZE) {
+                        throw new NodeException("Payload of " + length + " bytes received, no more than 1600003 was expected.");
+                    }
+                    checksum = new byte[4];
+                    buffer.get(checksum);
+                    state = ReaderState.DATA;
+                    if (buffer.remaining() < length) {
+                        // We need to compact the buffer to make sure the message fits even if it's really big.
+                        buffer.compact();
+                    }
+                case DATA:
+                    if (buffer.remaining() < length) return;
+                    if (!testChecksum(buffer)) {
+                        throw new NodeException("Checksum failed for message '" + command + "'");
+                    }
+                    try {
+                        MessagePayload payload = V3MessageFactory.getPayload(
+                                command,
+                                new ByteArrayInputStream(buffer.array(), buffer.arrayOffset() + buffer.position(), length),
+                                length);
+                        if (payload != null) {
+                            messages.add(new NetworkMessage(payload));
+                        }
+                    } catch (IOException e) {
+                        throw new NodeException(e.getMessage());
+                    }
+                    state = ReaderState.MAGIC;
+            }
+        }
+    }
+
+    public List<NetworkMessage> getMessages() {
+        return messages;
+    }
+
+    private boolean findMagicBytes(ByteBuffer buffer) {
+        int i = 0;
+        while (buffer.hasRemaining()) {
+            if (buffer.get() == MAGIC_BYTES[i]) {
+                buffer.mark();
+                i++;
+                if (i == MAGIC_BYTES.length) return true;
+            } else {
+                i = 0;
+            }
+        }
+        if (i > 0) {
+            buffer.reset();
+            buffer.compact();
+        } else {
+            buffer.clear();
+        }
+        return false;
+    }
+
+    private static String getCommand(ByteBuffer buffer) {
+        int start = buffer.position();
+        int i = 0;
+        while (i < 12 && buffer.get() != 0) i++;
+        int end = start + i;
+        while (i < 12) {
+            if (buffer.get() != 0) throw new NodeException("'\\0' padding expected for command");
+            i++;
+        }
+        try {
+            return new String(buffer.array(), start, end, "ASCII");
+        } catch (UnsupportedEncodingException e) {
+            throw new ApplicationException(e);
+        }
+    }
+
+    private boolean testChecksum(ByteBuffer buffer) {
+        byte[] payloadChecksum = cryptography().sha512(buffer.array(),
+                buffer.arrayOffset() + buffer.position(), length);
+        for (int i = 0; i < checksum.length; i++) {
+            if (checksum[i] != payloadChecksum[i]) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private enum ReaderState {MAGIC, HEADER, DATA}
+}
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java b/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
index 3b08377..f67b6d4 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
@@ -61,6 +61,12 @@ public abstract class AbstractCryptography implements Cryptography, InternalCont
         this.context = context;
     }
 
+    public byte[] sha512(byte[] data, int offset, int length) {
+        MessageDigest mda = md("SHA-512");
+        mda.update(data, offset, length);
+        return mda.digest();
+    }
+
     public byte[] sha512(byte[]... data) {
         return hash("SHA-512", data);
     }
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/Cryptography.java b/core/src/main/java/ch/dissem/bitmessage/ports/Cryptography.java
index 48739ea..9ea6a9d 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/Cryptography.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/Cryptography.java
@@ -30,6 +30,18 @@ import java.security.SecureRandom;
  * which should be secure enough.
  */
 public interface Cryptography {
+    /**
+     * A helper method to calculate SHA-512 hashes. Please note that a new {@link MessageDigest} object is created at
+     * each call (to ensure thread safety), so you shouldn't use this if you need to do many hash calculations in
+     * success on the same thread.
+     *
+     * @param data   to get hashed
+     * @param offset of the data to be hashed
+     * @param length of the data to be hashed
+     * @return SHA-512 hash of data within the given range
+     */
+    byte[] sha512(byte[] data, int offset, int length);
+
     /**
      * A helper method to calculate SHA-512 hashes. Please note that a new {@link MessageDigest} object is created at
      * each call (to ensure thread safety), so you shouldn't use this if you need to do many hash calculations in
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java b/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
index bfbb48c..96dec8e 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
@@ -23,6 +23,7 @@ import ch.dissem.bitmessage.utils.Property;
 
 import java.io.IOException;
 import java.net.InetAddress;
+import java.util.Collection;
 import java.util.concurrent.Future;
 
 /**
@@ -30,6 +31,8 @@ import java.util.concurrent.Future;
  */
 public interface NetworkHandler {
     int NETWORK_MAGIC_NUMBER = 8;
+    int MAX_PAYLOAD_SIZE = 1600003;
+    int MAX_MESSAGE_SIZE = 24 + MAX_PAYLOAD_SIZE;
 
     /**
      * Connects to the trusted host, fetches and offers new messages and disconnects afterwards.
@@ -65,6 +68,13 @@ public interface NetworkHandler {
      */
     void offer(InventoryVector iv);
 
+    /**
+     * Request each of those objects from a node that knows of the requested object.
+     *
+     * @param inventoryVectors of the objects to be requested
+     */
+    void request(Collection<InventoryVector> inventoryVectors);
+
     Property getNetworkStatus();
 
     boolean isRunning();
diff --git a/core/src/main/java/ch/dissem/bitmessage/utils/Decode.java b/core/src/main/java/ch/dissem/bitmessage/utils/Decode.java
index 47b0ee3..fb2f3c8 100644
--- a/core/src/main/java/ch/dissem/bitmessage/utils/Decode.java
+++ b/core/src/main/java/ch/dissem/bitmessage/utils/Decode.java
@@ -111,6 +111,10 @@ public class Decode {
         return stream.read() * 16777216L + stream.read() * 65536L + stream.read() * 256L + stream.read();
     }
 
+    public static long uint32(ByteBuffer buffer) {
+        return buffer.get() * 16777216L + buffer.get() * 65536L + buffer.get() * 256L + buffer.get();
+    }
+
     public static int int32(InputStream stream) throws IOException {
         return int32(stream, null);
     }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
new file mode 100644
index 0000000..3027f04
--- /dev/null
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
@@ -0,0 +1,318 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.networking;
+
+import ch.dissem.bitmessage.BitmessageContext;
+import ch.dissem.bitmessage.InternalContext;
+import ch.dissem.bitmessage.entity.*;
+import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
+import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
+import ch.dissem.bitmessage.exception.InsufficientProofOfWorkException;
+import ch.dissem.bitmessage.exception.NodeException;
+import ch.dissem.bitmessage.ports.NetworkHandler;
+import ch.dissem.bitmessage.utils.UnixTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedDeque;
+
+import static ch.dissem.bitmessage.InternalContext.NETWORK_EXTRA_BYTES;
+import static ch.dissem.bitmessage.InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE;
+import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SYNC;
+import static ch.dissem.bitmessage.networking.AbstractConnection.State.*;
+import static ch.dissem.bitmessage.utils.Singleton.cryptography;
+import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
+
+/**
+ * Contains everything used by both the old streams-oriented NetworkHandler and the new NioNetworkHandler,
+ * respectively their connection objects.
+ */
+public abstract class AbstractConnection {
+    private static final Logger LOG = LoggerFactory.getLogger(AbstractConnection.class);
+    protected final InternalContext ctx;
+    protected final Mode mode;
+    protected final NetworkAddress host;
+    protected final NetworkAddress node;
+    protected final NetworkHandler.MessageListener listener;
+    protected final Map<InventoryVector, Long> ivCache;
+    protected final Deque<MessagePayload> sendingQueue;
+    protected final Set<InventoryVector> commonRequestedObjects;
+    protected final Set<InventoryVector> requestedObjects;
+
+    protected volatile State state;
+    protected long lastObjectTime;
+
+    protected long peerNonce;
+    protected int version;
+    protected long[] streams;
+
+    public AbstractConnection(InternalContext context, Mode mode,
+                              NetworkAddress node,
+                              NetworkHandler.MessageListener listener,
+                              Set<InventoryVector> commonRequestedObjects,
+                              boolean threadsafe) {
+        this.ctx = context;
+        this.mode = mode;
+        this.host = new NetworkAddress.Builder().ipv6(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0).port(0).build();
+        this.node = node;
+        this.listener = listener;
+        if (threadsafe) {
+            this.ivCache = new ConcurrentHashMap<>();
+            this.sendingQueue = new ConcurrentLinkedDeque<>();
+            this.requestedObjects = Collections.newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(10_000));
+        } else {
+            this.ivCache = new HashMap<>();
+            this.sendingQueue = new LinkedList<>();
+            this.requestedObjects = new HashSet<>();
+        }
+        this.state = CONNECTING;
+        this.commonRequestedObjects = commonRequestedObjects;
+    }
+
+    public Mode getMode() {
+        return mode;
+    }
+
+    public NetworkAddress getNode() {
+        return node;
+    }
+
+    public State getState() {
+        return state;
+    }
+
+    protected void handleMessage(MessagePayload payload) {
+        switch (state) {
+            case ACTIVE:
+                receiveMessage(payload);
+                break;
+
+            default:
+                handleCommand(payload);
+                break;
+        }
+    }
+
+    private void receiveMessage(MessagePayload messagePayload) {
+        switch (messagePayload.getCommand()) {
+            case INV:
+                receiveMessage((Inv) messagePayload);
+                break;
+            case GETDATA:
+                receiveMessage((GetData) messagePayload);
+                break;
+            case OBJECT:
+                receiveMessage((ObjectMessage) messagePayload);
+                break;
+            case ADDR:
+                receiveMessage((Addr) messagePayload);
+                break;
+            case CUSTOM:
+            case VERACK:
+            case VERSION:
+            default:
+                throw new IllegalStateException("Unexpectedly received '" + messagePayload.getCommand() + "' command");
+        }
+    }
+
+    private void receiveMessage(Inv inv) {
+        int originalSize = inv.getInventory().size();
+        updateIvCache(inv.getInventory());
+        List<InventoryVector> missing = ctx.getInventory().getMissing(inv.getInventory(), streams);
+        missing.removeAll(commonRequestedObjects);
+        LOG.debug("Received inventory with " + originalSize + " elements, of which are "
+                + missing.size() + " missing.");
+        send(new GetData.Builder().inventory(missing).build());
+    }
+
+    private void receiveMessage(GetData getData) {
+        for (InventoryVector iv : getData.getInventory()) {
+            ObjectMessage om = ctx.getInventory().getObject(iv);
+            if (om != null) sendingQueue.offer(om);
+        }
+    }
+
+    private void receiveMessage(ObjectMessage objectMessage) {
+        requestedObjects.remove(objectMessage.getInventoryVector());
+        if (ctx.getInventory().contains(objectMessage)) {
+            LOG.trace("Received object " + objectMessage.getInventoryVector() + " - already in inventory");
+            return;
+        }
+        try {
+            listener.receive(objectMessage);
+            cryptography().checkProofOfWork(objectMessage, NETWORK_NONCE_TRIALS_PER_BYTE, NETWORK_EXTRA_BYTES);
+            ctx.getInventory().storeObject(objectMessage);
+            // offer object to some random nodes so it gets distributed throughout the network:
+            ctx.getNetworkHandler().offer(objectMessage.getInventoryVector());
+            lastObjectTime = UnixTime.now();
+        } catch (InsufficientProofOfWorkException e) {
+            LOG.warn(e.getMessage());
+            // DebugUtils.saveToFile(objectMessage); // this line must not be committed active
+        } catch (IOException e) {
+            LOG.error("Stream " + objectMessage.getStream() + ", object type " + objectMessage.getType() + ": " + e.getMessage(), e);
+        } finally {
+            if (commonRequestedObjects.remove(objectMessage.getInventoryVector())) {
+                LOG.debug("Received object that wasn't requested.");
+            }
+        }
+    }
+
+    private void receiveMessage(Addr addr) {
+        LOG.debug("Received " + addr.getAddresses().size() + " addresses.");
+        ctx.getNodeRegistry().offerAddresses(addr.getAddresses());
+    }
+
+    private void updateIvCache(List<InventoryVector> inventory) {
+        cleanupIvCache();
+        Long now = UnixTime.now();
+        for (InventoryVector iv : inventory) {
+            ivCache.put(iv, now);
+        }
+    }
+
+    public void offer(InventoryVector iv) {
+        sendingQueue.offer(new Inv.Builder()
+                .addInventoryVector(iv)
+                .build());
+        updateIvCache(Collections.singletonList(iv));
+    }
+
+    public boolean knowsOf(InventoryVector iv) {
+        return ivCache.containsKey(iv);
+    }
+
+    protected void cleanupIvCache() {
+        Long fiveMinutesAgo = UnixTime.now(-5 * MINUTE);
+        for (Map.Entry<InventoryVector, Long> entry : ivCache.entrySet()) {
+            if (entry.getValue() < fiveMinutesAgo) {
+                ivCache.remove(entry.getKey());
+            }
+        }
+    }
+
+    private void handleCommand(MessagePayload payload) {
+        switch (payload.getCommand()) {
+            case VERSION:
+                handleVersion((Version) payload);
+                break;
+            case VERACK:
+                switch (mode) {
+                    case SERVER:
+                        activateConnection();
+                        break;
+                    case CLIENT:
+                    case SYNC:
+                    default:
+                        // NO OP
+                        break;
+                }
+                break;
+            case CUSTOM:
+                MessagePayload response = ctx.getCustomCommandHandler().handle((CustomMessage) payload);
+                if (response != null) {
+                    send(response);
+                }
+                disconnect();
+                break;
+            default:
+                throw new NodeException("Command 'version' or 'verack' expected, but was '"
+                        + payload.getCommand() + "'");
+        }
+    }
+
+    protected void activateConnection() {
+        LOG.info("Successfully established connection with node " + node);
+        state = ACTIVE;
+        node.setTime(UnixTime.now());
+        if (mode != SYNC) {
+            sendAddresses();
+            ctx.getNodeRegistry().offerAddresses(Collections.singletonList(node));
+        }
+        sendInventory();
+    }
+
+    private void sendAddresses() {
+        List<NetworkAddress> addresses = ctx.getNodeRegistry().getKnownAddresses(1000, streams);
+        sendingQueue.offer(new Addr.Builder().addresses(addresses).build());
+    }
+
+    private void sendInventory() {
+        List<InventoryVector> inventory = ctx.getInventory().getInventory(streams);
+        for (int i = 0; i < inventory.size(); i += 50000) {
+            sendingQueue.offer(new Inv.Builder()
+                    .inventory(inventory.subList(i, Math.min(inventory.size(), i + 50000)))
+                    .build());
+        }
+    }
+
+    private void handleVersion(Version version) {
+        if (version.getNonce() == ctx.getClientNonce()) {
+            LOG.info("Tried to connect to self, disconnecting.");
+            disconnect();
+        } else if (version.getVersion() >= BitmessageContext.CURRENT_VERSION) {
+            this.peerNonce = version.getNonce();
+            if (peerNonce == ctx.getClientNonce()) disconnect();
+
+            this.version = version.getVersion();
+            this.streams = version.getStreams();
+            send(new VerAck());
+            switch (mode) {
+                case SERVER:
+                    send(new Version.Builder().defaults(ctx.getClientNonce()).addrFrom(host).addrRecv(node).build());
+                    break;
+                case CLIENT:
+                case SYNC:
+                    activateConnection();
+                    break;
+                default:
+                    // NO OP
+            }
+        } else {
+            LOG.info("Received unsupported version " + version.getVersion() + ", disconnecting.");
+            disconnect();
+        }
+    }
+
+    public void disconnect() {
+        state = DISCONNECTED;
+
+        // Make sure objects that are still missing are requested from other nodes
+        ctx.getNetworkHandler().request(requestedObjects);
+    }
+
+    protected abstract void send(MessagePayload payload);
+
+    public enum Mode {SERVER, CLIENT, SYNC}
+
+    public enum State {CONNECTING, ACTIVE, DISCONNECTED}
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        AbstractConnection that = (AbstractConnection) o;
+        return Objects.equals(node, that.node);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(node);
+    }
+}
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
index 9ed19bc..3fe1b62 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
@@ -16,13 +16,13 @@
 
 package ch.dissem.bitmessage.networking;
 
-import ch.dissem.bitmessage.BitmessageContext;
 import ch.dissem.bitmessage.InternalContext;
-import ch.dissem.bitmessage.entity.*;
+import ch.dissem.bitmessage.entity.GetData;
+import ch.dissem.bitmessage.entity.MessagePayload;
+import ch.dissem.bitmessage.entity.NetworkMessage;
+import ch.dissem.bitmessage.entity.Version;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
-import ch.dissem.bitmessage.exception.InsufficientProofOfWorkException;
-import ch.dissem.bitmessage.exception.NodeException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.NetworkHandler.MessageListener;
 import ch.dissem.bitmessage.utils.UnixTime;
@@ -36,94 +36,62 @@ import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentLinkedDeque;
-import java.util.concurrent.ConcurrentMap;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
 
-import static ch.dissem.bitmessage.InternalContext.NETWORK_EXTRA_BYTES;
-import static ch.dissem.bitmessage.InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE;
-import static ch.dissem.bitmessage.networking.Connection.Mode.CLIENT;
-import static ch.dissem.bitmessage.networking.Connection.Mode.SYNC;
-import static ch.dissem.bitmessage.networking.Connection.State.*;
-import static ch.dissem.bitmessage.utils.Singleton.cryptography;
+import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.CLIENT;
+import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SYNC;
+import static ch.dissem.bitmessage.networking.AbstractConnection.State.ACTIVE;
+import static ch.dissem.bitmessage.networking.AbstractConnection.State.DISCONNECTED;
 import static ch.dissem.bitmessage.utils.UnixTime.MINUTE;
 
 /**
  * A connection to a specific node
  */
-class Connection {
+class Connection extends AbstractConnection {
     public static final int READ_TIMEOUT = 2000;
     private static final Logger LOG = LoggerFactory.getLogger(Connection.class);
     private static final int CONNECT_TIMEOUT = 5000;
 
     private final long startTime;
-    private final ConcurrentMap<InventoryVector, Long> ivCache;
-    private final InternalContext ctx;
-    private final Mode mode;
     private final Socket socket;
-    private final MessageListener listener;
-    private final NetworkAddress host;
-    private final NetworkAddress node;
-    private final Queue<MessagePayload> sendingQueue = new ConcurrentLinkedDeque<>();
-    private final Set<InventoryVector> commonRequestedObjects;
-    private final Set<InventoryVector> requestedObjects;
     private final long syncTimeout;
     private final ReaderRunnable reader = new ReaderRunnable();
     private final WriterRunnable writer = new WriterRunnable();
-    private final DefaultNetworkHandler networkHandler;
-    private final long clientNonce;
 
-    private volatile State state;
     private InputStream in;
     private OutputStream out;
-    private int version;
-    private long[] streams;
     private int readTimeoutCounter;
     private boolean socketInitialized;
-    private long lastObjectTime;
 
     public Connection(InternalContext context, Mode mode, Socket socket, MessageListener listener,
-                      Set<InventoryVector> requestedObjectsMap, long clientNonce) throws IOException {
+                      Set<InventoryVector> requestedObjectsMap) throws IOException {
         this(context, mode, listener, socket, requestedObjectsMap,
-                Collections.newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(10_000)),
                 new NetworkAddress.Builder().ip(socket.getInetAddress()).port(socket.getPort()).stream(1).build(),
-                0, clientNonce);
+                0);
     }
 
     public Connection(InternalContext context, Mode mode, NetworkAddress node, MessageListener listener,
-                      Set<InventoryVector> requestedObjectsMap, long clientNonce) {
+                      Set<InventoryVector> requestedObjectsMap) {
         this(context, mode, listener, new Socket(), requestedObjectsMap,
-                Collections.newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(10_000)),
-                node, 0, clientNonce);
+                node, 0);
     }
 
     private Connection(InternalContext context, Mode mode, MessageListener listener, Socket socket,
-                       Set<InventoryVector> commonRequestedObjects, Set<InventoryVector> requestedObjects,
-                       NetworkAddress node, long syncTimeout, long clientNonce) {
+                       Set<InventoryVector> commonRequestedObjects, NetworkAddress node, long syncTimeout) {
+        super(context, mode, node, listener, commonRequestedObjects, true);
         this.startTime = UnixTime.now();
-        this.ctx = context;
-        this.mode = mode;
-        this.state = CONNECTING;
-        this.listener = listener;
         this.socket = socket;
-        this.commonRequestedObjects = commonRequestedObjects;
-        this.requestedObjects = requestedObjects;
-        this.host = new NetworkAddress.Builder().ipv6(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0).port(0).build();
-        this.node = node;
         this.syncTimeout = (syncTimeout > 0 ? UnixTime.now(+syncTimeout) : 0);
-        this.ivCache = new ConcurrentHashMap<>();
-        this.networkHandler = (DefaultNetworkHandler) ctx.getNetworkHandler();
-        this.clientNonce = clientNonce;
     }
 
     public static Connection sync(InternalContext ctx, InetAddress address, int port, MessageListener listener,
                                   long timeoutInSeconds) throws IOException {
         return new Connection(ctx, SYNC, listener, new Socket(address, port),
-                new HashSet<InventoryVector>(),
                 new HashSet<InventoryVector>(),
                 new NetworkAddress.Builder().ip(address).port(port).stream(1).build(),
-                timeoutInSeconds, cryptography().randomNonce());
+                timeoutInSeconds);
     }
 
     public long getStartTime() {
@@ -169,133 +137,8 @@ class Connection {
         }
     }
 
-    private void activateConnection() {
-        LOG.info("Successfully established connection with node " + node);
-        state = ACTIVE;
-        if (mode != SYNC) {
-            sendAddresses();
-            ctx.getNodeRegistry().offerAddresses(Collections.singletonList(node));
-        }
-        sendInventory();
-        node.setTime(UnixTime.now());
-    }
-
-    private void cleanupIvCache() {
-        Long fiveMinutesAgo = UnixTime.now(-5 * MINUTE);
-        for (Map.Entry<InventoryVector, Long> entry : ivCache.entrySet()) {
-            if (entry.getValue() < fiveMinutesAgo) {
-                ivCache.remove(entry.getKey());
-            }
-        }
-    }
-
-    private void updateIvCache(InventoryVector... inventory) {
-        cleanupIvCache();
-        Long now = UnixTime.now();
-        for (InventoryVector iv : inventory) {
-            ivCache.put(iv, now);
-        }
-    }
-
-    private void updateIvCache(List<InventoryVector> inventory) {
-        cleanupIvCache();
-        Long now = UnixTime.now();
-        for (InventoryVector iv : inventory) {
-            ivCache.put(iv, now);
-        }
-    }
-
-    private void receiveMessage(MessagePayload messagePayload) {
-        switch (messagePayload.getCommand()) {
-            case INV:
-                receiveMessage((Inv) messagePayload);
-                break;
-            case GETDATA:
-                receiveMessage((GetData) messagePayload);
-                break;
-            case OBJECT:
-                receiveMessage((ObjectMessage) messagePayload);
-                break;
-            case ADDR:
-                receiveMessage((Addr) messagePayload);
-                break;
-            case CUSTOM:
-            case VERACK:
-            case VERSION:
-            default:
-                throw new IllegalStateException("Unexpectedly received '" + messagePayload.getCommand() + "' command");
-        }
-    }
-
-    private void receiveMessage(Inv inv) {
-        int originalSize = inv.getInventory().size();
-        updateIvCache(inv.getInventory());
-        List<InventoryVector> missing = ctx.getInventory().getMissing(inv.getInventory(), streams);
-        missing.removeAll(commonRequestedObjects);
-        LOG.debug("Received inventory with " + originalSize + " elements, of which are "
-                + missing.size() + " missing.");
-        send(new GetData.Builder().inventory(missing).build());
-    }
-
-    private void receiveMessage(GetData getData) {
-        for (InventoryVector iv : getData.getInventory()) {
-            ObjectMessage om = ctx.getInventory().getObject(iv);
-            if (om != null) sendingQueue.offer(om);
-        }
-    }
-
-    private void receiveMessage(ObjectMessage objectMessage) {
-        requestedObjects.remove(objectMessage.getInventoryVector());
-        if (ctx.getInventory().contains(objectMessage)) {
-            LOG.trace("Received object " + objectMessage.getInventoryVector() + " - already in inventory");
-            return;
-        }
-        try {
-            listener.receive(objectMessage);
-            cryptography().checkProofOfWork(objectMessage, NETWORK_NONCE_TRIALS_PER_BYTE, NETWORK_EXTRA_BYTES);
-            ctx.getInventory().storeObject(objectMessage);
-            // offer object to some random nodes so it gets distributed throughout the network:
-            networkHandler.offer(objectMessage.getInventoryVector());
-            lastObjectTime = UnixTime.now();
-        } catch (InsufficientProofOfWorkException e) {
-            LOG.warn(e.getMessage());
-            // DebugUtils.saveToFile(objectMessage); // this line must not be committed active
-        } catch (IOException e) {
-            LOG.error("Stream " + objectMessage.getStream() + ", object type " + objectMessage.getType() + ": " + e.getMessage(), e);
-        } finally {
-            if (commonRequestedObjects.remove(objectMessage.getInventoryVector())) {
-                LOG.debug("Received object that wasn't requested.");
-            }
-        }
-    }
-
-    private void receiveMessage(Addr addr) {
-        LOG.debug("Received " + addr.getAddresses().size() + " addresses.");
-        ctx.getNodeRegistry().offerAddresses(addr.getAddresses());
-    }
-
-    private void sendAddresses() {
-        List<NetworkAddress> addresses = ctx.getNodeRegistry().getKnownAddresses(1000, streams);
-        sendingQueue.offer(new Addr.Builder().addresses(addresses).build());
-    }
-
-    private void sendInventory() {
-        List<InventoryVector> inventory = ctx.getInventory().getInventory(streams);
-        for (int i = 0; i < inventory.size(); i += 50000) {
-            sendingQueue.offer(new Inv.Builder()
-                    .inventory(inventory.subList(i, Math.min(inventory.size(), i + 50000)))
-                    .build());
-        }
-    }
-
-    public void disconnect() {
-        state = DISCONNECTED;
-
-        // Make sure objects that are still missing are requested from other nodes
-        networkHandler.request(requestedObjects);
-    }
-
-    void send(MessagePayload payload) {
+    @Override
+    protected void send(MessagePayload payload) {
         try {
             if (payload instanceof GetData) {
                 requestedObjects.addAll(((GetData) payload).getInventory());
@@ -309,17 +152,6 @@ class Connection {
         }
     }
 
-    public void offer(InventoryVector iv) {
-        sendingQueue.offer(new Inv.Builder()
-                .addInventoryVector(iv)
-                .build());
-        updateIvCache(iv);
-    }
-
-    public boolean knowsOf(InventoryVector iv) {
-        return ivCache.containsKey(iv);
-    }
-
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -354,18 +186,13 @@ class Connection {
         return writer;
     }
 
-    public enum Mode {SERVER, CLIENT, SYNC}
-
-    public enum State {CONNECTING, ACTIVE, DISCONNECTED}
-
     public class ReaderRunnable implements Runnable {
         @Override
         public void run() {
-            lastObjectTime = 0;
             try (Socket socket = Connection.this.socket) {
                 initSocket(socket);
                 if (mode == CLIENT || mode == SYNC) {
-                    send(new Version.Builder().defaults(clientNonce).addrFrom(host).addrRecv(node).build());
+                    send(new Version.Builder().defaults(peerNonce).addrFrom(host).addrRecv(node).build());
                 }
                 while (state != DISCONNECTED) {
                     if (mode != SYNC) {
@@ -394,75 +221,13 @@ class Connection {
                 NetworkMessage msg = Factory.getNetworkMessage(version, in);
                 if (msg == null)
                     return;
-                switch (state) {
-                    case ACTIVE:
-                        receiveMessage(msg.getPayload());
-                        break;
-
-                    default:
-                        handleCommand(msg.getPayload());
-                        break;
-                }
+                handleMessage(msg.getPayload());
                 if (socket.isClosed() || syncFinished(msg) || checkOpenRequests()) disconnect();
             } catch (SocketTimeoutException ignore) {
                 if (state == ACTIVE && syncFinished(null)) disconnect();
             }
         }
 
-        private void handleCommand(MessagePayload payload) {
-            switch (payload.getCommand()) {
-                case VERSION:
-                    handleVersion((Version) payload);
-                    break;
-                case VERACK:
-                    switch (mode) {
-                        case SERVER:
-                            activateConnection();
-                            break;
-                        case CLIENT:
-                        case SYNC:
-                        default:
-                            // NO OP
-                            break;
-                    }
-                    break;
-                case CUSTOM:
-                    MessagePayload response = ctx.getCustomCommandHandler().handle((CustomMessage) payload);
-                    if (response != null) {
-                        send(response);
-                    }
-                    disconnect();
-                    break;
-                default:
-                    throw new NodeException("Command 'version' or 'verack' expected, but was '"
-                            + payload.getCommand() + "'");
-            }
-        }
-
-        private void handleVersion(Version version) {
-            if (version.getNonce() == ctx.getClientNonce()) {
-                LOG.info("Tried to connect to self, disconnecting.");
-                disconnect();
-            } else if (version.getVersion() >= BitmessageContext.CURRENT_VERSION) {
-                Connection.this.version = version.getVersion();
-                streams = version.getStreams();
-                send(new VerAck());
-                switch (mode) {
-                    case SERVER:
-                        send(new Version.Builder().defaults(clientNonce).addrFrom(host).addrRecv(node).build());
-                        break;
-                    case CLIENT:
-                    case SYNC:
-                        activateConnection();
-                        break;
-                    default:
-                        // NO OP
-                }
-            } else {
-                LOG.info("Received unsupported version " + version.getVersion() + ", disconnecting.");
-                disconnect();
-            }
-        }
     }
 
     private boolean checkOpenRequests() {
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java b/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
index c25a31c..5c976e2 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
 import java.util.Iterator;
 import java.util.List;
 
-import static ch.dissem.bitmessage.networking.Connection.Mode.CLIENT;
+import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.CLIENT;
 import static ch.dissem.bitmessage.networking.DefaultNetworkHandler.NETWORK_MAGIC_NUMBER;
 
 /**
@@ -38,17 +38,15 @@ public class ConnectionOrganizer implements Runnable {
     private final InternalContext ctx;
     private final DefaultNetworkHandler networkHandler;
     private final NetworkHandler.MessageListener listener;
-    private final long clientNonce;
 
     private Connection initialConnection;
 
     public ConnectionOrganizer(InternalContext ctx,
                                DefaultNetworkHandler networkHandler,
-                               NetworkHandler.MessageListener listener, long clientNonce) {
+                               NetworkHandler.MessageListener listener) {
         this.ctx = ctx;
         this.networkHandler = networkHandler;
         this.listener = listener;
-        this.clientNonce = clientNonce;
     }
 
     @Override
@@ -94,7 +92,7 @@ public class ConnectionOrganizer implements Runnable {
                         boolean first = active == 0 && initialConnection == null;
                         for (NetworkAddress address : addresses) {
                             Connection c = new Connection(ctx, CLIENT, address, listener,
-                                    networkHandler.requestedObjects, clientNonce);
+                                    networkHandler.requestedObjects);
                             if (first) {
                                 initialConnection = c;
                                 first = false;
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
index 2b06373..c4a4554 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
@@ -35,8 +35,8 @@ import java.net.Socket;
 import java.util.*;
 import java.util.concurrent.*;
 
-import static ch.dissem.bitmessage.networking.Connection.Mode.SERVER;
-import static ch.dissem.bitmessage.networking.Connection.State.ACTIVE;
+import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SERVER;
+import static ch.dissem.bitmessage.networking.AbstractConnection.State.ACTIVE;
 import static ch.dissem.bitmessage.utils.DebugUtils.inc;
 import static ch.dissem.bitmessage.utils.ThreadFactoryBuilder.pool;
 import static java.util.Collections.newSetFromMap;
@@ -107,9 +107,9 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
         try {
             running = true;
             connections.clear();
-            server = new ServerRunnable(ctx, this, listener, ctx.getClientNonce());
+            server = new ServerRunnable(ctx, this, listener);
             pool.execute(server);
-            pool.execute(new ConnectionOrganizer(ctx, this, listener, ctx.getClientNonce()));
+            pool.execute(new ConnectionOrganizer(ctx, this, listener));
         } catch (IOException e) {
             throw new ApplicationException(e);
         }
@@ -198,7 +198,8 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
         );
     }
 
-    void request(Set<InventoryVector> inventoryVectors) {
+    @Override
+    public void request(Collection<InventoryVector> inventoryVectors) {
         if (!running || inventoryVectors.isEmpty()) return;
 
         Map<Connection, List<InventoryVector>> distribution = new HashMap<>();
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java b/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java
index 5a866b9..99b6a88 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java
@@ -26,7 +26,7 @@ import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 
-import static ch.dissem.bitmessage.networking.Connection.Mode.SERVER;
+import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SERVER;
 
 /**
  * @author Christian Basler
@@ -37,15 +37,13 @@ public class ServerRunnable implements Runnable, Closeable {
     private final ServerSocket serverSocket;
     private final DefaultNetworkHandler networkHandler;
     private final NetworkHandler.MessageListener listener;
-    private final long clientNonce;
 
     public ServerRunnable(InternalContext ctx, DefaultNetworkHandler networkHandler,
-                          NetworkHandler.MessageListener listener, long clientNonce) throws IOException {
+                          NetworkHandler.MessageListener listener) throws IOException {
         this.ctx = ctx;
         this.networkHandler = networkHandler;
         this.listener = listener;
         this.serverSocket = new ServerSocket(ctx.getPort());
-        this.clientNonce = clientNonce;
     }
 
     @Override
@@ -55,7 +53,7 @@ public class ServerRunnable implements Runnable, Closeable {
                 Socket socket = serverSocket.accept();
                 socket.setSoTimeout(Connection.READ_TIMEOUT);
                 networkHandler.startConnection(new Connection(ctx, SERVER, socket, listener,
-                        networkHandler.requestedObjects, clientNonce));
+                        networkHandler.requestedObjects));
             } catch (IOException e) {
                 LOG.debug(e.getMessage(), e);
             }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
index 3361693..223722a 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
@@ -16,25 +16,43 @@
 
 package ch.dissem.bitmessage.networking.nio;
 
+import ch.dissem.bitmessage.InternalContext;
 import ch.dissem.bitmessage.entity.MessagePayload;
+import ch.dissem.bitmessage.entity.NetworkMessage;
+import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
+import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
+import ch.dissem.bitmessage.factory.V3MessageReader;
+import ch.dissem.bitmessage.networking.AbstractConnection;
+import ch.dissem.bitmessage.ports.NetworkHandler;
 
 import java.nio.ByteBuffer;
-import java.util.Queue;
+import java.util.*;
 import java.util.concurrent.ConcurrentLinkedDeque;
 
+import static ch.dissem.bitmessage.ports.NetworkHandler.MAX_MESSAGE_SIZE;
+
 /**
- * Created by chrig on 27.05.2016.
+ * Represents the current state of a connection.
  */
-public class ConnectionInfo {
-    private State state;
-    private final Queue<MessagePayload> sendingQueue = new ConcurrentLinkedDeque<>();
-    private ByteBuffer in = ByteBuffer.allocate(10);
-    private ByteBuffer out = ByteBuffer.allocate(10);
+public class ConnectionInfo extends AbstractConnection {
+    private ByteBuffer in = ByteBuffer.allocate(MAX_MESSAGE_SIZE);
+    private ByteBuffer out = ByteBuffer.allocate(MAX_MESSAGE_SIZE);
+    private V3MessageReader reader = new V3MessageReader();
+
+    public ConnectionInfo(InternalContext context, Mode mode,
+                          NetworkAddress node, NetworkHandler.MessageListener listener,
+                          Set<InventoryVector> commonRequestedObjects) {
+        super(context, mode, node, listener, commonRequestedObjects, false);
+    }
 
     public State getState() {
         return state;
     }
 
+    public boolean knowsOf(InventoryVector iv) {
+        return ivCache.containsKey(iv);
+    }
+
     public Queue<MessagePayload> getSendingQueue() {
         return sendingQueue;
     }
@@ -47,5 +65,24 @@ public class ConnectionInfo {
         return out;
     }
 
-    public enum State {CONNECTING, ACTIVE, DISCONNECTED}
+    public void updateReader() {
+        reader.update(in);
+        if (!reader.getMessages().isEmpty()) {
+            Iterator<NetworkMessage> iterator = reader.getMessages().iterator();
+            while (iterator.hasNext()) {
+                NetworkMessage msg = iterator.next();
+                handleMessage(msg.getPayload());
+                iterator.remove();
+            }
+        }
+    }
+
+    public List<NetworkMessage> getMessages() {
+        return reader.getMessages();
+    }
+
+    @Override
+    protected void send(MessagePayload payload) {
+        sendingQueue.addFirst(payload);
+    }
 }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index 4f56d42..c3689af 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -22,7 +22,10 @@ import ch.dissem.bitmessage.entity.GetData;
 import ch.dissem.bitmessage.entity.MessagePayload;
 import ch.dissem.bitmessage.entity.NetworkMessage;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
+import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
 import ch.dissem.bitmessage.exception.ApplicationException;
+import ch.dissem.bitmessage.exception.NodeException;
+import ch.dissem.bitmessage.factory.V3MessageReader;
 import ch.dissem.bitmessage.ports.NetworkHandler;
 import ch.dissem.bitmessage.utils.Property;
 import org.slf4j.Logger;
@@ -31,16 +34,16 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
+import java.nio.ByteBuffer;
+import java.nio.channels.*;
+import java.util.*;
 import java.util.concurrent.Future;
 
-import static java.nio.channels.SelectionKey.*;
+import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SERVER;
+import static ch.dissem.bitmessage.networking.AbstractConnection.State.ACTIVE;
+import static ch.dissem.bitmessage.utils.DebugUtils.inc;
+import static java.nio.channels.SelectionKey.OP_READ;
+import static java.nio.channels.SelectionKey.OP_WRITE;
 
 /**
  * Network handler using java.nio, resulting in less threads.
@@ -50,6 +53,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
 
     private InternalContext ctx;
     private Selector selector;
+    private ServerSocketChannel serverChannel;
 
     @Override
     public Future<?> synchronize(InetAddress server, int port, MessageListener listener, long timeoutInSeconds) {
@@ -58,11 +62,38 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
 
     @Override
     public CustomMessage send(InetAddress server, int port, CustomMessage request) {
-        return null;
+        try (SocketChannel channel = SocketChannel.open(new InetSocketAddress(server, port))) {
+            channel.configureBlocking(true);
+            ByteBuffer buffer = ByteBuffer.allocate(MAX_MESSAGE_SIZE);
+            new NetworkMessage(request).write(buffer);
+            channel.write(buffer);
+            buffer.clear();
+
+            V3MessageReader reader = new V3MessageReader();
+            while (reader.getMessages().isEmpty()) {
+                channel.read(buffer);
+                buffer.flip();
+                reader.update(buffer);
+            }
+            NetworkMessage networkMessage = reader.getMessages().get(0);
+
+            if (networkMessage != null && networkMessage.getPayload() instanceof CustomMessage) {
+                return (CustomMessage) networkMessage.getPayload();
+            } else {
+                if (networkMessage == null) {
+                    throw new NodeException("No response from node " + server);
+                } else {
+                    throw new NodeException("Unexpected response from node " +
+                            server + ": " + networkMessage.getPayload().getCommand());
+                }
+            }
+        } catch (IOException e) {
+            throw new ApplicationException(e);
+        }
     }
 
     @Override
-    public void start(MessageListener listener) {
+    public void start(final MessageListener listener) {
         if (listener == null) {
             throw new IllegalStateException("Listener must be set at start");
         }
@@ -70,50 +101,83 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
             throw new IllegalStateException("Network already running - you need to stop first.");
         }
         try {
-            final Set<InventoryVector> requestedObjects = new HashSet<>();
             selector = Selector.open();
-            {
-                ServerSocketChannel server = ServerSocketChannel.open();
-                server.configureBlocking(false);
-                server.bind(new InetSocketAddress(ctx.getPort()));
-                server.register(selector, OP_ACCEPT);
-            }
-            while (selector.isOpen()) {
-                // TODO: establish outgoing connections
-                selector.select();
-                Iterator<SelectionKey> keyIterator = selector.selectedKeys().iterator();
+        } catch (IOException e) {
+            throw new ApplicationException(e);
+        }
+        final Set<InventoryVector> requestedObjects = new HashSet<>();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    serverChannel = ServerSocketChannel.open();
+                    serverChannel.bind(new InetSocketAddress(ctx.getPort()));
 
-                while (keyIterator.hasNext()) {
-                    SelectionKey key = keyIterator.next();
-                    if (key.isAcceptable()) {
-                        SocketChannel accepted = ((ServerSocketChannel) key.channel()).accept();
-                        accepted.configureBlocking(false);
-                        accepted.register(selector, OP_READ | OP_WRITE).attach(new ConnectionInfo());
-                    }
-                    if (key.attachment() instanceof ConnectionInfo) {
-                        SocketChannel channel = (SocketChannel) key.channel();
-                        ConnectionInfo connection = (ConnectionInfo) key.attachment();
-
-                        if (key.isWritable()) {
-                            if (connection.getOutBuffer().hasRemaining()) {
-                                channel.write(connection.getOutBuffer());
-                            }
-                            while (!connection.getOutBuffer().hasRemaining() && !connection.getSendingQueue().isEmpty()) {
-                                MessagePayload payload = connection.getSendingQueue().poll();
-                                if (payload instanceof GetData) {
-                                    requestedObjects.addAll(((GetData) payload).getInventory());
-                                }
-                                new NetworkMessage(payload).write(connection.getOutBuffer());
-                            }
-                        }
-                        if (key.isReadable()) {
-                            // TODO
-                            channel.read(connection.getInBuffer());
-                        }
-                    }
-                    keyIterator.remove();
+                    SocketChannel accepted = serverChannel.accept();
+                    accepted.configureBlocking(false);
+                    // FIXME: apparently it isn't good practice to generally listen for OP_WRITE
+                    accepted.register(selector, OP_READ | OP_WRITE).attach(
+                            new ConnectionInfo(ctx, SERVER,
+                                    new NetworkAddress.Builder().address(accepted.getRemoteAddress()).stream(1).build(),
+                                    listener,
+                                    requestedObjects
+                            ));
+                } catch (ClosedSelectorException | AsynchronousCloseException ignore) {
+                } catch (IOException e) {
+                    throw new ApplicationException(e);
                 }
             }
+        }, "Server").start();
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    while (selector.isOpen()) {
+                        // TODO: establish outgoing connections
+                        Iterator<SelectionKey> keyIterator = selector.selectedKeys().iterator();
+
+                        while (keyIterator.hasNext()) {
+                            SelectionKey key = keyIterator.next();
+                            if (key.attachment() instanceof ConnectionInfo) {
+                                SocketChannel channel = (SocketChannel) key.channel();
+                                ConnectionInfo connection = (ConnectionInfo) key.attachment();
+
+                                if (key.isWritable()) {
+                                    if (connection.getOutBuffer().hasRemaining()) {
+                                        channel.write(connection.getOutBuffer());
+                                    }
+                                    while (!connection.getOutBuffer().hasRemaining() && !connection.getSendingQueue().isEmpty()) {
+                                        MessagePayload payload = connection.getSendingQueue().poll();
+                                        if (payload instanceof GetData) {
+                                            requestedObjects.addAll(((GetData) payload).getInventory());
+                                        }
+                                        new NetworkMessage(payload).write(connection.getOutBuffer());
+                                    }
+                                }
+                                if (key.isReadable()) {
+                                    channel.read(connection.getInBuffer());
+                                    connection.updateReader();
+                                }
+                            }
+                            keyIterator.remove();
+                        }
+                    }
+                    selector.close();
+                } catch (ClosedSelectorException ignore) {
+                } catch (IOException e) {
+                    throw new ApplicationException(e);
+                }
+            }
+        }, "Connections").start();
+    }
+
+    @Override
+    public void stop() {
+        try {
+            serverChannel.close();
+            for (SelectionKey key : selector.keys()) {
+                key.channel().close();
+            }
             selector.close();
         } catch (IOException e) {
             throw new ApplicationException(e);
@@ -121,23 +185,57 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
     }
 
     @Override
-    public void stop() {
-
+    public void offer(InventoryVector iv) {
+        // TODO
     }
 
     @Override
-    public void offer(InventoryVector iv) {
-
+    public void request(Collection<InventoryVector> inventoryVectors) {
+        // TODO
     }
 
     @Override
     public Property getNetworkStatus() {
-        return null;
+        TreeSet<Long> streams = new TreeSet<>();
+        TreeMap<Long, Integer> incomingConnections = new TreeMap<>();
+        TreeMap<Long, Integer> outgoingConnections = new TreeMap<>();
+
+        for (SelectionKey key : selector.keys()) {
+            if (key.attachment() instanceof ConnectionInfo) {
+                ConnectionInfo connection = (ConnectionInfo) key.attachment();
+                if (connection.getState() == ACTIVE) {
+                    long stream = connection.getNode().getStream();
+                    streams.add(stream);
+                    if (connection.getMode() == SERVER) {
+                        inc(incomingConnections, stream);
+                    } else {
+                        inc(outgoingConnections, stream);
+                    }
+                }
+            }
+        }
+        Property[] streamProperties = new Property[streams.size()];
+        int i = 0;
+        for (Long stream : streams) {
+            int incoming = incomingConnections.containsKey(stream) ? incomingConnections.get(stream) : 0;
+            int outgoing = outgoingConnections.containsKey(stream) ? outgoingConnections.get(stream) : 0;
+            streamProperties[i] = new Property("stream " + stream,
+                    null, new Property("nodes", incoming + outgoing),
+                    new Property("incoming", incoming),
+                    new Property("outgoing", outgoing)
+            );
+            i++;
+        }
+        return new Property("network", null,
+                new Property("connectionManager", isRunning() ? "running" : "stopped"),
+                new Property("connections", null, streamProperties),
+                new Property("requestedObjects", "requestedObjects.size()") // TODO
+        );
     }
 
     @Override
     public boolean isRunning() {
-        return false;
+        return selector != null && selector.isOpen();
     }
 
     @Override
diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index 3841be3..5dbf077 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -24,7 +24,9 @@ import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
 import ch.dissem.bitmessage.exception.NodeException;
 import ch.dissem.bitmessage.ports.*;
 import ch.dissem.bitmessage.utils.Property;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
 import java.net.InetAddress;
 import java.util.concurrent.Future;
@@ -89,6 +91,9 @@ public class NetworkHandlerTest {
                                     break;
                                 case 3:
                                     data[0] = 0;
+                                    break;
+                                default:
+                                    break;
                             }
                         }
                         return new CustomMessage("test response", request.getData());
@@ -115,7 +120,7 @@ public class NetworkHandlerTest {
         } while (ctx.isRunning());
     }
 
-    @Test(timeout = 5_000)
+    @Test//(timeout = 5_000)
     public void ensureNodesAreConnecting() {
         node.startup();
         Property status;

From 12fb794203ef99ed09bf3f155ef1b147b86b7424 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Thu, 9 Jun 2016 17:40:26 +0200
Subject: [PATCH 54/87] Minor test improvements

---
 .../networking/NetworkHandlerTest.java        | 74 ++++++++++++-------
 1 file changed, 47 insertions(+), 27 deletions(-)

diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index 5dbf077..2cadfb0 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -27,8 +27,9 @@ import ch.dissem.bitmessage.utils.Property;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-import java.net.InetAddress;
 import java.util.concurrent.Future;
 
 import static ch.dissem.bitmessage.utils.Singleton.cryptography;
@@ -42,7 +43,8 @@ import static org.mockito.Mockito.mock;
  * FIXME: there really should be sensible tests for the network handler
  */
 public class NetworkHandlerTest {
-    private static NetworkAddress localhost = new NetworkAddress.Builder().ipv4(127, 0, 0, 1).port(6001).build();
+    private static final Logger LOG = LoggerFactory.getLogger(NetworkHandlerTest.class);
+    private static NetworkAddress peerAddress = new NetworkAddress.Builder().ipv4(127, 0, 0, 1).port(6001).build();
 
     private TestInventory peerInventory;
     private TestInventory nodeInventory;
@@ -59,26 +61,11 @@ public class NetworkHandlerTest {
                 .inventory(peerInventory)
                 .messageRepo(mock(MessageRepository.class))
                 .powRepo(mock(ProofOfWorkRepository.class))
-                .port(6001)
+                .port(peerAddress.getPort())
                 .nodeRegistry(new TestNodeRegistry())
                 .networkHandler(new DefaultNetworkHandler())
                 .cryptography(new BouncyCryptography())
                 .listener(mock(BitmessageContext.Listener.class))
-                .build();
-        peer.startup();
-
-        nodeInventory = new TestInventory();
-        networkHandler = new DefaultNetworkHandler();
-        node = new BitmessageContext.Builder()
-                .addressRepo(mock(AddressRepository.class))
-                .inventory(nodeInventory)
-                .messageRepo(mock(MessageRepository.class))
-                .powRepo(mock(ProofOfWorkRepository.class))
-                .port(6002)
-                .nodeRegistry(new TestNodeRegistry(localhost))
-                .networkHandler(networkHandler)
-                .cryptography(new BouncyCryptography())
-                .listener(mock(BitmessageContext.Listener.class))
                 .customCommandHandler(new CustomCommandHandler() {
                     @Override
                     public MessagePayload handle(CustomMessage request) {
@@ -100,12 +87,28 @@ public class NetworkHandlerTest {
                     }
                 })
                 .build();
+        peer.startup();
+
+        nodeInventory = new TestInventory();
+        networkHandler = new DefaultNetworkHandler();
+        node = new BitmessageContext.Builder()
+                .addressRepo(mock(AddressRepository.class))
+                .inventory(nodeInventory)
+                .messageRepo(mock(MessageRepository.class))
+                .powRepo(mock(ProofOfWorkRepository.class))
+                .port(6002)
+                .nodeRegistry(new TestNodeRegistry(peerAddress))
+                .networkHandler(networkHandler)
+                .cryptography(new BouncyCryptography())
+                .listener(mock(BitmessageContext.Listener.class))
+                .build();
     }
 
     @After
     public void cleanUp() {
         shutdown(peer);
         shutdown(node);
+        shutdown(networkHandler);
     }
 
     private static void shutdown(BitmessageContext ctx) {
@@ -120,12 +123,29 @@ public class NetworkHandlerTest {
         } while (ctx.isRunning());
     }
 
-    @Test//(timeout = 5_000)
-    public void ensureNodesAreConnecting() {
+    private static void shutdown(NetworkHandler networkHandler) {
+        if (!networkHandler.isRunning()) return;
+
+        networkHandler.stop();
+        do {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ignore) {
+                if (networkHandler.isRunning()) {
+                    LOG.warn("Thread interrupted while waiting for network shutdown - " +
+                            "this could cause problems in subsequent tests.");
+                }
+                return;
+            }
+        } while (networkHandler.isRunning());
+    }
+
+    @Test(timeout = 5_000)
+    public void ensureNodesAreConnecting() throws Exception {
         node.startup();
         Property status;
         do {
-            Thread.yield();
+            Thread.sleep(100);
             status = node.status().getProperty("network", "connections", "stream 0");
         } while (status == null);
         assertEquals(1, status.getProperty("outgoing").getValue());
@@ -138,7 +158,7 @@ public class NetworkHandlerTest {
         CustomMessage request = new CustomMessage("test request", data);
         node.startup();
 
-        CustomMessage response = networkHandler.send(InetAddress.getLocalHost(), 6002, request);
+        CustomMessage response = networkHandler.send(peerAddress.toInetAddress(), peerAddress.getPort(), request);
 
         assertThat(response, notNullValue());
         assertThat(response.getCustomCommand(), is("test response"));
@@ -146,13 +166,13 @@ public class NetworkHandlerTest {
     }
 
     @Test(timeout = 5_000, expected = NodeException.class)
-    public void ensureCustomMessageWithoutResponsYieldsException() throws Exception {
+    public void ensureCustomMessageWithoutResponseYieldsException() throws Exception {
         byte[] data = cryptography().randomBytes(8);
         data[0] = (byte) 0;
         CustomMessage request = new CustomMessage("test request", data);
         node.startup();
 
-        CustomMessage response = networkHandler.send(InetAddress.getLocalHost(), 6002, request);
+        CustomMessage response = networkHandler.send(peerAddress.toInetAddress(), peerAddress.getPort(), request);
 
         assertThat(response, notNullValue());
         assertThat(response.getCustomCommand(), is("test response"));
@@ -171,7 +191,7 @@ public class NetworkHandlerTest {
                 "V4Pubkey.payload"
         );
 
-        Future<?> future = networkHandler.synchronize(InetAddress.getLocalHost(), 6001,
+        Future<?> future = networkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
                 mock(NetworkHandler.MessageListener.class),
                 10);
         future.get();
@@ -188,7 +208,7 @@ public class NetworkHandlerTest {
 
         nodeInventory.init();
 
-        Future<?> future = networkHandler.synchronize(InetAddress.getLocalHost(), 6001,
+        Future<?> future = networkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
                 mock(NetworkHandler.MessageListener.class),
                 10);
         future.get();
@@ -204,7 +224,7 @@ public class NetworkHandlerTest {
                 "V1Msg.payload"
         );
 
-        Future<?> future = networkHandler.synchronize(InetAddress.getLocalHost(), 6001,
+        Future<?> future = networkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
                 mock(NetworkHandler.MessageListener.class),
                 10);
         future.get();

From 62d40fb2c3cf65138e73fab56887bc7ca30dc58d Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Sun, 12 Jun 2016 20:43:23 +0200
Subject: [PATCH 55/87] Improved unsigned byte comparison

---
 core/src/main/java/ch/dissem/bitmessage/utils/Bytes.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/utils/Bytes.java b/core/src/main/java/ch/dissem/bitmessage/utils/Bytes.java
index 8107eb0..986c288 100644
--- a/core/src/main/java/ch/dissem/bitmessage/utils/Bytes.java
+++ b/core/src/main/java/ch/dissem/bitmessage/utils/Bytes.java
@@ -23,6 +23,8 @@ package ch.dissem.bitmessage.utils;
  * situations.
  */
 public class Bytes {
+    public static final byte BYTE_0x80 = (byte) 0x80;
+
     public static void inc(byte[] nonce) {
         for (int i = nonce.length - 1; i >= 0; i--) {
             nonce[i]++;
@@ -82,11 +84,7 @@ public class Bytes {
     }
 
     private static boolean lt(byte a, byte b) {
-        if (a < 0) return b < 0 && a < b;
-        if (b < 0) return a >= 0 || a < b;
-        return a < b;
-        // This would be easier to understand, but is (slightly) slower:
-        // return (a & 0xff) < (b & 0xff);
+        return (a ^ BYTE_0x80) < (b ^ BYTE_0x80);
     }
 
     /**

From ed4fd1002b17042dce1fb944e5e53cbbd55bbd0a Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Sun, 12 Jun 2016 20:53:05 +0200
Subject: [PATCH 56/87] Improved uint reading

---
 .../ch/dissem/bitmessage/utils/Decode.java    | 102 +++++++++---------
 1 file changed, 54 insertions(+), 48 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/utils/Decode.java b/core/src/main/java/ch/dissem/bitmessage/utils/Decode.java
index fb2f3c8..c15f397 100644
--- a/core/src/main/java/ch/dissem/bitmessage/utils/Decode.java
+++ b/core/src/main/java/ch/dissem/bitmessage/utils/Decode.java
@@ -27,30 +27,29 @@ import static ch.dissem.bitmessage.utils.AccessCounter.inc;
  * https://bitmessage.org/wiki/Protocol_specification#Common_structures
  */
 public class Decode {
-    public static byte[] shortVarBytes(InputStream stream, AccessCounter counter) throws IOException {
-        int length = uint16(stream, counter);
-        return bytes(stream, length, counter);
+    public static byte[] shortVarBytes(InputStream in, AccessCounter counter) throws IOException {
+        int length = uint16(in, counter);
+        return bytes(in, length, counter);
     }
 
-    public static byte[] varBytes(InputStream stream) throws IOException {
-        int length = (int) varInt(stream, null);
-        return bytes(stream, length, null);
+    public static byte[] varBytes(InputStream in) throws IOException {
+        return varBytes(in, null);
     }
 
-    public static byte[] varBytes(InputStream stream, AccessCounter counter) throws IOException {
-        int length = (int) varInt(stream, counter);
-        return bytes(stream, length, counter);
+    public static byte[] varBytes(InputStream in, AccessCounter counter) throws IOException {
+        int length = (int) varInt(in, counter);
+        return bytes(in, length, counter);
     }
 
-    public static byte[] bytes(InputStream stream, int count) throws IOException {
-        return bytes(stream, count, null);
+    public static byte[] bytes(InputStream in, int count) throws IOException {
+        return bytes(in, count, null);
     }
 
-    public static byte[] bytes(InputStream stream, int count, AccessCounter counter) throws IOException {
+    public static byte[] bytes(InputStream in, int count, AccessCounter counter) throws IOException {
         byte[] result = new byte[count];
         int off = 0;
         while (off < count) {
-            int read = stream.read(result, off, count - off);
+            int read = in.read(result, off, count - off);
             if (read < 0) {
                 throw new IOException("Unexpected end of stream, wanted to read " + count + " bytes but only got " + off);
             }
@@ -60,87 +59,94 @@ public class Decode {
         return result;
     }
 
-    public static long[] varIntList(InputStream stream) throws IOException {
-        int length = (int) varInt(stream);
+    public static long[] varIntList(InputStream in) throws IOException {
+        int length = (int) varInt(in);
         long[] result = new long[length];
 
         for (int i = 0; i < length; i++) {
-            result[i] = varInt(stream);
+            result[i] = varInt(in);
         }
         return result;
     }
 
-    public static long varInt(InputStream stream) throws IOException {
-        return varInt(stream, null);
+    public static long varInt(InputStream in) throws IOException {
+        return varInt(in, null);
     }
 
-    public static long varInt(InputStream stream, AccessCounter counter) throws IOException {
-        int first = stream.read();
+    public static long varInt(InputStream in, AccessCounter counter) throws IOException {
+        int first = in.read();
         inc(counter);
         switch (first) {
             case 0xfd:
-                return uint16(stream, counter);
+                return uint16(in, counter);
             case 0xfe:
-                return uint32(stream, counter);
+                return uint32(in, counter);
             case 0xff:
-                return int64(stream, counter);
+                return int64(in, counter);
             default:
                 return first;
         }
     }
 
-    public static int uint8(InputStream stream) throws IOException {
-        return stream.read();
+    public static int uint8(InputStream in) throws IOException {
+        return in.read();
     }
 
-    public static int uint16(InputStream stream) throws IOException {
-        return uint16(stream, null);
+    public static int uint16(InputStream in) throws IOException {
+        return uint16(in, null);
     }
 
-    public static int uint16(InputStream stream, AccessCounter counter) throws IOException {
+    public static int uint16(InputStream in, AccessCounter counter) throws IOException {
         inc(counter, 2);
-        return stream.read() * 256 + stream.read();
+        return in.read() << 8 | in.read();
     }
 
-    public static long uint32(InputStream stream) throws IOException {
-        return uint32(stream, null);
+    public static long uint32(InputStream in) throws IOException {
+        return uint32(in, null);
     }
 
-    public static long uint32(InputStream stream, AccessCounter counter) throws IOException {
+    public static long uint32(InputStream in, AccessCounter counter) throws IOException {
         inc(counter, 4);
-        return stream.read() * 16777216L + stream.read() * 65536L + stream.read() * 256L + stream.read();
+        return in.read() << 24 | in.read() << 16 | in.read() << 8 | in.read();
     }
 
-    public static long uint32(ByteBuffer buffer) {
-        return buffer.get() * 16777216L + buffer.get() * 65536L + buffer.get() * 256L + buffer.get();
+    public static long uint32(ByteBuffer in) {
+        return u(in.get()) << 24 | u(in.get()) << 16 | u(in.get()) << 8 | u(in.get());
     }
 
-    public static int int32(InputStream stream) throws IOException {
-        return int32(stream, null);
+    public static int int32(InputStream in) throws IOException {
+        return int32(in, null);
     }
 
-    public static int int32(InputStream stream, AccessCounter counter) throws IOException {
+    public static int int32(InputStream in, AccessCounter counter) throws IOException {
         inc(counter, 4);
-        return ByteBuffer.wrap(bytes(stream, 4)).getInt();
+        return ByteBuffer.wrap(bytes(in, 4)).getInt();
     }
 
-    public static long int64(InputStream stream) throws IOException {
-        return int64(stream, null);
+    public static long int64(InputStream in) throws IOException {
+        return int64(in, null);
     }
 
-    public static long int64(InputStream stream, AccessCounter counter) throws IOException {
+    public static long int64(InputStream in, AccessCounter counter) throws IOException {
         inc(counter, 8);
-        return ByteBuffer.wrap(bytes(stream, 8)).getLong();
+        return ByteBuffer.wrap(bytes(in, 8)).getLong();
     }
 
-    public static String varString(InputStream stream) throws IOException {
-        return varString(stream, null);
+    public static String varString(InputStream in) throws IOException {
+        return varString(in, null);
     }
 
-    public static String varString(InputStream stream, AccessCounter counter) throws IOException {
-        int length = (int) varInt(stream, counter);
+    public static String varString(InputStream in, AccessCounter counter) throws IOException {
+        int length = (int) varInt(in, counter);
         // FIXME: technically, it says the length in characters, but I think this one might be correct
         // otherwise it will get complicated, as we'll need to read UTF-8 char by char...
-        return new String(bytes(stream, length, counter), "utf-8");
+        return new String(bytes(in, length, counter), "utf-8");
+    }
+
+    /**
+     * Returns the given byte as if it were unsigned.
+     */
+    private static int u(byte b) {
+        return b & 0xFF;
     }
 }

From 0fadb40c6cca6d97c0f8aa02c8ba7695fea93663 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Thu, 16 Jun 2016 19:47:59 +0200
Subject: [PATCH 57/87] Improved tests and fixed some

---
 core/build.gradle                             |   2 +-
 .../ch/dissem/bitmessage/entity/Version.java  |   1 -
 .../ch/dissem/bitmessage/factory/Factory.java |   2 +-
 .../bitmessage/factory/V3MessageReader.java   |  31 ++--
 .../ports/AbstractCryptography.java           |   2 +-
 cryptography-bc/build.gradle                  |   2 +-
 cryptography-sc/build.gradle                  |   2 +-
 demo/build.gradle                             |   2 +-
 .../java/ch/dissem/bitmessage/SystemTest.java |   4 +-
 extensions/build.gradle                       |   2 +-
 networking/build.gradle                       |   2 +-
 .../networking/AbstractConnection.java        |  35 ++--
 .../networking/nio/ConnectionInfo.java        |  18 +-
 .../networking/nio/NioNetworkHandler.java     | 173 ++++++++++++++----
 .../networking/NetworkHandlerTest.java        |  59 ++++--
 wif/build.gradle                              |   2 +-
 16 files changed, 234 insertions(+), 105 deletions(-)

diff --git a/core/build.gradle b/core/build.gradle
index dd100e6..73f8fdf 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -25,7 +25,7 @@ artifacts {
 
 dependencies {
     compile 'org.slf4j:slf4j-api:1.7.12'
-    testCompile 'junit:junit:4.11'
+    testCompile 'junit:junit:4.12'
     testCompile 'org.hamcrest:hamcrest-library:1.3'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile project(':cryptography-bc')
diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/Version.java b/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
index 48022c4..4d0fd05 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/Version.java
@@ -24,7 +24,6 @@ import ch.dissem.bitmessage.utils.UnixTime;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
-import java.util.Random;
 
 /**
  * The 'version' command advertises this node's latest supported protocol version upon initiation.
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
index 0597f6a..07b3161 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/Factory.java
@@ -40,7 +40,7 @@ import static ch.dissem.bitmessage.utils.Singleton.cryptography;
  * Creates {@link NetworkMessage} objects from {@link InputStream InputStreams}
  */
 public class Factory {
-    public static final Logger LOG = LoggerFactory.getLogger(Factory.class);
+    private static final Logger LOG = LoggerFactory.getLogger(Factory.class);
 
     public static NetworkMessage getNetworkMessage(int version, InputStream stream) throws SocketTimeoutException {
         try {
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
index 7006cdb..80220f1 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
@@ -52,23 +52,21 @@ public class V3MessageReader {
                     state = ReaderState.HEADER;
                 case HEADER:
                     if (buffer.remaining() < 20) {
-                        buffer.compact();
                         return;
                     }
                     command = getCommand(buffer);
                     length = (int) Decode.uint32(buffer);
                     if (length > MAX_PAYLOAD_SIZE) {
-                        throw new NodeException("Payload of " + length + " bytes received, no more than 1600003 was expected.");
+                        throw new NodeException("Payload of " + length + " bytes received, no more than " +
+                                MAX_PAYLOAD_SIZE + " was expected.");
                     }
                     checksum = new byte[4];
                     buffer.get(checksum);
                     state = ReaderState.DATA;
-                    if (buffer.remaining() < length) {
-                        // We need to compact the buffer to make sure the message fits even if it's really big.
-                        buffer.compact();
-                    }
                 case DATA:
-                    if (buffer.remaining() < length) return;
+                    if (buffer.remaining() < length) {
+                        return;
+                    }
                     if (!testChecksum(buffer)) {
                         throw new NodeException("Checksum failed for message '" + command + "'");
                     }
@@ -95,34 +93,35 @@ public class V3MessageReader {
     private boolean findMagicBytes(ByteBuffer buffer) {
         int i = 0;
         while (buffer.hasRemaining()) {
-            if (buffer.get() == MAGIC_BYTES[i]) {
+            if (i == 0) {
                 buffer.mark();
+            }
+            if (buffer.get() == MAGIC_BYTES[i]) {
                 i++;
-                if (i == MAGIC_BYTES.length) return true;
+                if (i == MAGIC_BYTES.length) {
+                    return true;
+                }
             } else {
                 i = 0;
             }
         }
         if (i > 0) {
             buffer.reset();
-            buffer.compact();
-        } else {
-            buffer.clear();
         }
         return false;
     }
 
     private static String getCommand(ByteBuffer buffer) {
         int start = buffer.position();
-        int i = 0;
-        while (i < 12 && buffer.get() != 0) i++;
-        int end = start + i;
+        int l = 0;
+        while (l < 12 && buffer.get() != 0) l++;
+        int i = l + 1;
         while (i < 12) {
             if (buffer.get() != 0) throw new NodeException("'\\0' padding expected for command");
             i++;
         }
         try {
-            return new String(buffer.array(), start, end, "ASCII");
+            return new String(buffer.array(), start, l, "ASCII");
         } catch (UnsupportedEncodingException e) {
             throw new ApplicationException(e);
         }
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java b/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
index f67b6d4..b02b12d 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/AbstractCryptography.java
@@ -43,7 +43,7 @@ import static ch.dissem.bitmessage.utils.Numbers.max;
  * Implements everything that isn't directly dependent on either Spongy- or Bouncycastle.
  */
 public abstract class AbstractCryptography implements Cryptography, InternalContext.ContextHolder {
-    public static final Logger LOG = LoggerFactory.getLogger(Cryptography.class);
+    protected static final Logger LOG = LoggerFactory.getLogger(Cryptography.class);
     private static final SecureRandom RANDOM = new SecureRandom();
     private static final BigInteger TWO = BigInteger.valueOf(2);
     private static final BigInteger TWO_POW_64 = TWO.pow(64);
diff --git a/cryptography-bc/build.gradle b/cryptography-bc/build.gradle
index c09b0db..0b87c17 100644
--- a/cryptography-bc/build.gradle
+++ b/cryptography-bc/build.gradle
@@ -13,6 +13,6 @@ uploadArchives {
 dependencies {
     compile project(':core')
     compile 'org.bouncycastle:bcprov-jdk15on:1.52'
-    testCompile 'junit:junit:4.11'
+    testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
 }
diff --git a/cryptography-sc/build.gradle b/cryptography-sc/build.gradle
index 16771fc..a052c2e 100644
--- a/cryptography-sc/build.gradle
+++ b/cryptography-sc/build.gradle
@@ -13,5 +13,5 @@ uploadArchives {
 dependencies {
     compile project(':core')
     compile 'com.madgag.spongycastle:prov:1.52.0.0'
-    testCompile 'junit:junit:4.11'
+    testCompile 'junit:junit:4.12'
 }
diff --git a/demo/build.gradle b/demo/build.gradle
index c1571ed..0cf1781 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -32,6 +32,6 @@ dependencies {
     compile 'args4j:args4j:2.32'
     compile 'com.h2database:h2:1.4.190'
     compile 'org.apache.commons:commons-lang3:3.4'
-    testCompile 'junit:junit:4.11'
+    testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
 }
diff --git a/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java b/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
index 03cbf5e..f2f02f2 100644
--- a/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
+++ b/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
@@ -88,7 +88,7 @@ public class SystemTest {
         bob.shutdown();
     }
 
-    @Test
+    @Test(timeout = 60_000)
     public void ensureAliceCanSendMessageToBob() throws Exception {
         String originalMessage = UUID.randomUUID().toString();
         alice.send(aliceIdentity, new BitmessageAddress(bobIdentity.getAddress()), "Subject", originalMessage);
@@ -102,7 +102,7 @@ public class SystemTest {
                 .markAsAcknowledged(any());
     }
 
-    @Test
+    @Test(timeout = 30_000)
     public void ensureBobCanReceiveBroadcastFromAlice() throws Exception {
         String originalMessage = UUID.randomUUID().toString();
         bob.addSubscribtion(new BitmessageAddress(aliceIdentity.getAddress()));
diff --git a/extensions/build.gradle b/extensions/build.gradle
index d44f900..42b175b 100644
--- a/extensions/build.gradle
+++ b/extensions/build.gradle
@@ -28,7 +28,7 @@ uploadArchives {
 
 dependencies {
     compile project(':core')
-    testCompile 'junit:junit:4.11'
+    testCompile 'junit:junit:4.12'
     testCompile 'org.slf4j:slf4j-simple:1.7.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile project(path: ':core', configuration: 'testArtifacts')
diff --git a/networking/build.gradle b/networking/build.gradle
index 984f585..49cafa5 100644
--- a/networking/build.gradle
+++ b/networking/build.gradle
@@ -12,7 +12,7 @@ uploadArchives {
 
 dependencies {
     compile project(':core')
-    testCompile 'junit:junit:4.11'
+    testCompile 'junit:junit:4.12'
     testCompile 'org.slf4j:slf4j-simple:1.7.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile project(path: ':core', configuration: 'testArtifacts')
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
index 3027f04..54897cb 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
@@ -35,6 +35,7 @@ import java.util.concurrent.ConcurrentLinkedDeque;
 
 import static ch.dissem.bitmessage.InternalContext.NETWORK_EXTRA_BYTES;
 import static ch.dissem.bitmessage.InternalContext.NETWORK_NONCE_TRIALS_PER_BYTE;
+import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SERVER;
 import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SYNC;
 import static ch.dissem.bitmessage.networking.AbstractConnection.State.*;
 import static ch.dissem.bitmessage.utils.Singleton.cryptography;
@@ -62,6 +63,8 @@ public abstract class AbstractConnection {
     protected long peerNonce;
     protected int version;
     protected long[] streams;
+    private boolean verackSent;
+    private boolean verackReceived;
 
     public AbstractConnection(InternalContext context, Mode mode,
                               NetworkAddress node,
@@ -198,7 +201,7 @@ public abstract class AbstractConnection {
         return ivCache.containsKey(iv);
     }
 
-    protected void cleanupIvCache() {
+    private void cleanupIvCache() {
         Long fiveMinutesAgo = UnixTime.now(-5 * MINUTE);
         for (Map.Entry<InventoryVector, Long> entry : ivCache.entrySet()) {
             if (entry.getValue() < fiveMinutesAgo) {
@@ -213,16 +216,10 @@ public abstract class AbstractConnection {
                 handleVersion((Version) payload);
                 break;
             case VERACK:
-                switch (mode) {
-                    case SERVER:
-                        activateConnection();
-                        break;
-                    case CLIENT:
-                    case SYNC:
-                    default:
-                        // NO OP
-                        break;
+                if (verackSent) {
+                    activateConnection();
                 }
+                verackReceived = true;
                 break;
             case CUSTOM:
                 MessagePayload response = ctx.getCustomCommandHandler().handle((CustomMessage) payload);
@@ -237,7 +234,7 @@ public abstract class AbstractConnection {
         }
     }
 
-    protected void activateConnection() {
+    private void activateConnection() {
         LOG.info("Successfully established connection with node " + node);
         state = ACTIVE;
         node.setTime(UnixTime.now());
@@ -272,17 +269,13 @@ public abstract class AbstractConnection {
 
             this.version = version.getVersion();
             this.streams = version.getStreams();
+            verackSent = true;
             send(new VerAck());
-            switch (mode) {
-                case SERVER:
-                    send(new Version.Builder().defaults(ctx.getClientNonce()).addrFrom(host).addrRecv(node).build());
-                    break;
-                case CLIENT:
-                case SYNC:
-                    activateConnection();
-                    break;
-                default:
-                    // NO OP
+            if (mode == SERVER) {
+                send(new Version.Builder().defaults(ctx.getClientNonce()).addrFrom(host).addrRecv(node).build());
+            }
+            if (verackReceived) {
+                activateConnection();
             }
         } else {
             LOG.info("Received unsupported version " + version.getVersion() + ", disconnecting.");
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
index 223722a..36bb463 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
@@ -19,6 +19,7 @@ package ch.dissem.bitmessage.networking.nio;
 import ch.dissem.bitmessage.InternalContext;
 import ch.dissem.bitmessage.entity.MessagePayload;
 import ch.dissem.bitmessage.entity.NetworkMessage;
+import ch.dissem.bitmessage.entity.Version;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
 import ch.dissem.bitmessage.factory.V3MessageReader;
@@ -26,9 +27,12 @@ import ch.dissem.bitmessage.networking.AbstractConnection;
 import ch.dissem.bitmessage.ports.NetworkHandler;
 
 import java.nio.ByteBuffer;
-import java.util.*;
-import java.util.concurrent.ConcurrentLinkedDeque;
+import java.util.Iterator;
+import java.util.Queue;
+import java.util.Set;
 
+import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.CLIENT;
+import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SYNC;
 import static ch.dissem.bitmessage.ports.NetworkHandler.MAX_MESSAGE_SIZE;
 
 /**
@@ -43,6 +47,10 @@ public class ConnectionInfo extends AbstractConnection {
                           NetworkAddress node, NetworkHandler.MessageListener listener,
                           Set<InventoryVector> commonRequestedObjects) {
         super(context, mode, node, listener, commonRequestedObjects, false);
+        out.flip();
+        if (mode == CLIENT || mode == SYNC) {
+            send(new Version.Builder().defaults(peerNonce).addrFrom(host).addrRecv(node).build());
+        }
     }
 
     public State getState() {
@@ -77,12 +85,8 @@ public class ConnectionInfo extends AbstractConnection {
         }
     }
 
-    public List<NetworkMessage> getMessages() {
-        return reader.getMessages();
-    }
-
     @Override
     protected void send(MessagePayload payload) {
-        sendingQueue.addFirst(payload);
+        sendingQueue.add(payload);
     }
 }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index c3689af..cfb6c2e 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -37,11 +37,14 @@ import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.*;
 import java.util.*;
-import java.util.concurrent.Future;
+import java.util.concurrent.*;
 
+import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.CLIENT;
 import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SERVER;
+import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SYNC;
 import static ch.dissem.bitmessage.networking.AbstractConnection.State.ACTIVE;
 import static ch.dissem.bitmessage.utils.DebugUtils.inc;
+import static ch.dissem.bitmessage.utils.ThreadFactoryBuilder.pool;
 import static java.nio.channels.SelectionKey.OP_READ;
 import static java.nio.channels.SelectionKey.OP_WRITE;
 
@@ -51,13 +54,40 @@ import static java.nio.channels.SelectionKey.OP_WRITE;
 public class NioNetworkHandler implements NetworkHandler, InternalContext.ContextHolder {
     private static final Logger LOG = LoggerFactory.getLogger(NioNetworkHandler.class);
 
+    private final ExecutorService pool = Executors.newCachedThreadPool(
+            pool("network")
+                    .lowPrio()
+                    .daemon()
+                    .build());
+
     private InternalContext ctx;
     private Selector selector;
     private ServerSocketChannel serverChannel;
 
     @Override
-    public Future<?> synchronize(InetAddress server, int port, MessageListener listener, long timeoutInSeconds) {
-        return null;
+    public Future<Void> synchronize(final InetAddress server, final int port, final MessageListener listener, long timeoutInSeconds) {
+        return pool.submit(new Callable<Void>() {
+            @Override
+            public Void call() throws Exception {
+                Set<InventoryVector> requestedObjects = new HashSet<>();
+                try (SocketChannel channel = SocketChannel.open(new InetSocketAddress(server, port))) {
+                    channel.finishConnect();
+                    channel.configureBlocking(false);
+                    ConnectionInfo connection = new ConnectionInfo(ctx, SYNC,
+                            new NetworkAddress.Builder().ip(server).port(port).stream(1).build(),
+                            listener, new HashSet<InventoryVector>());
+                    while (channel.isConnected() &&
+                            (connection.getState() != ACTIVE
+                                    || connection.getSendingQueue().isEmpty()
+                                    || requestedObjects.isEmpty())) {
+                        write(requestedObjects, channel, connection);
+                        read(channel, connection);
+                        Thread.sleep(10);
+                    }
+                }
+                return null;
+            }
+        });
     }
 
     @Override
@@ -66,7 +96,9 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
             channel.configureBlocking(true);
             ByteBuffer buffer = ByteBuffer.allocate(MAX_MESSAGE_SIZE);
             new NetworkMessage(request).write(buffer);
-            channel.write(buffer);
+            while (buffer.hasRemaining()) {
+                channel.write(buffer);
+            }
             buffer.clear();
 
             V3MessageReader reader = new V3MessageReader();
@@ -106,34 +138,74 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
             throw new ApplicationException(e);
         }
         final Set<InventoryVector> requestedObjects = new HashSet<>();
-        new Thread(new Runnable() {
+        start("connection listener", new Runnable() {
             @Override
             public void run() {
                 try {
                     serverChannel = ServerSocketChannel.open();
-                    serverChannel.bind(new InetSocketAddress(ctx.getPort()));
-
-                    SocketChannel accepted = serverChannel.accept();
-                    accepted.configureBlocking(false);
-                    // FIXME: apparently it isn't good practice to generally listen for OP_WRITE
-                    accepted.register(selector, OP_READ | OP_WRITE).attach(
-                            new ConnectionInfo(ctx, SERVER,
-                                    new NetworkAddress.Builder().address(accepted.getRemoteAddress()).stream(1).build(),
-                                    listener,
-                                    requestedObjects
-                            ));
+                    serverChannel.socket().bind(new InetSocketAddress(ctx.getPort()));
+                    while (selector.isOpen() && serverChannel.isOpen()) {
+                        try {
+                            SocketChannel accepted = serverChannel.accept();
+                            accepted.configureBlocking(false);
+                            accepted.register(selector, OP_READ | OP_WRITE,
+                                    new ConnectionInfo(ctx, SERVER,
+                                            new NetworkAddress.Builder().address(accepted.getRemoteAddress()).stream(1).build(),
+                                            listener,
+                                            requestedObjects
+                                    ));
+                        } catch (AsynchronousCloseException ignore) {
+                        } catch (IOException e) {
+                            LOG.error(e.getMessage(), e);
+                        }
+                    }
                 } catch (ClosedSelectorException | AsynchronousCloseException ignore) {
                 } catch (IOException e) {
                     throw new ApplicationException(e);
+                } catch (RuntimeException e) {
+                    e.printStackTrace();
+                    throw e;
                 }
             }
-        }, "Server").start();
-        new Thread(new Runnable() {
+        });
+
+        start("connection starter", new Runnable() {
+            @Override
+            public void run() {
+                while (selector.isOpen()) {
+                    List<NetworkAddress> addresses = ctx.getNodeRegistry().getKnownAddresses(
+                            2, ctx.getStreams());
+                    for (NetworkAddress address : addresses) {
+                        try {
+                            SocketChannel channel = SocketChannel.open(
+                                    new InetSocketAddress(address.toInetAddress(), address.getPort()));
+                            channel.configureBlocking(false);
+                            channel.register(selector, OP_READ | OP_WRITE,
+                                    new ConnectionInfo(ctx, CLIENT,
+                                            address,
+                                            listener,
+                                            requestedObjects
+                                    ));
+                        } catch (AsynchronousCloseException ignore) {
+                        } catch (IOException e) {
+                            LOG.error(e.getMessage(), e);
+                        }
+                    }
+                    try {
+                        Thread.sleep(30_000);
+                    } catch (InterruptedException e) {
+                        return;
+                    }
+                }
+            }
+        });
+
+        start("processor", new Runnable() {
             @Override
             public void run() {
                 try {
                     while (selector.isOpen()) {
-                        // TODO: establish outgoing connections
+                        selector.select(1000);
                         Iterator<SelectionKey> keyIterator = selector.selectedKeys().iterator();
 
                         while (keyIterator.hasNext()) {
@@ -141,22 +213,16 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                             if (key.attachment() instanceof ConnectionInfo) {
                                 SocketChannel channel = (SocketChannel) key.channel();
                                 ConnectionInfo connection = (ConnectionInfo) key.attachment();
-
                                 if (key.isWritable()) {
-                                    if (connection.getOutBuffer().hasRemaining()) {
-                                        channel.write(connection.getOutBuffer());
-                                    }
-                                    while (!connection.getOutBuffer().hasRemaining() && !connection.getSendingQueue().isEmpty()) {
-                                        MessagePayload payload = connection.getSendingQueue().poll();
-                                        if (payload instanceof GetData) {
-                                            requestedObjects.addAll(((GetData) payload).getInventory());
-                                        }
-                                        new NetworkMessage(payload).write(connection.getOutBuffer());
-                                    }
+                                    write(requestedObjects, channel, connection);
                                 }
                                 if (key.isReadable()) {
-                                    channel.read(connection.getInBuffer());
-                                    connection.updateReader();
+                                    read(channel, connection);
+                                }
+                                if (connection.getSendingQueue().isEmpty()) {
+                                    key.interestOps(OP_READ);
+                                } else {
+                                    key.interestOps(OP_READ | OP_WRITE);
                                 }
                             }
                             keyIterator.remove();
@@ -168,13 +234,52 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                     throw new ApplicationException(e);
                 }
             }
-        }, "Connections").start();
+        });
+    }
+
+    private static void write(Set<InventoryVector> requestedObjects, SocketChannel channel, ConnectionInfo connection)
+            throws IOException {
+        if (!connection.getSendingQueue().isEmpty()) {
+            ByteBuffer buffer = connection.getOutBuffer();
+            if (buffer.hasRemaining()) {
+                channel.write(buffer);
+            }
+            while (!buffer.hasRemaining()
+                    && !connection.getSendingQueue().isEmpty()) {
+                buffer.clear();
+                MessagePayload payload = connection.getSendingQueue().poll();
+                if (payload instanceof GetData) {
+                    requestedObjects.addAll(((GetData) payload).getInventory());
+                }
+                new NetworkMessage(payload).write(buffer);
+                buffer.flip();
+                if (buffer.hasRemaining()) {
+                    channel.write(buffer);
+                }
+            }
+        }
+    }
+
+    private static void read(SocketChannel channel, ConnectionInfo connection) throws IOException {
+        ByteBuffer buffer = connection.getInBuffer();
+        while (channel.read(buffer) > 0) {
+            buffer.flip();
+            connection.updateReader();
+            buffer.compact();
+        }
+    }
+
+    private void start(String threadName, Runnable runnable) {
+        Thread thread = new Thread(runnable, threadName);
+        thread.setDaemon(true);
+        thread.setPriority(Thread.MIN_PRIORITY);
+        thread.start();
     }
 
     @Override
     public void stop() {
         try {
-            serverChannel.close();
+            serverChannel.socket().close();
             for (SelectionKey key : selector.keys()) {
                 key.channel().close();
             }
diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index 2cadfb0..1b7994a 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -22,14 +22,23 @@ import ch.dissem.bitmessage.entity.CustomMessage;
 import ch.dissem.bitmessage.entity.MessagePayload;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
 import ch.dissem.bitmessage.exception.NodeException;
+import ch.dissem.bitmessage.networking.nio.NioNetworkHandler;
 import ch.dissem.bitmessage.ports.*;
 import ch.dissem.bitmessage.utils.Property;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.DisableOnDebug;
+import org.junit.rules.TestRule;
+import org.junit.rules.Timeout;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.concurrent.Future;
 
 import static ch.dissem.bitmessage.utils.Singleton.cryptography;
@@ -42,6 +51,7 @@ import static org.mockito.Mockito.mock;
 /**
  * FIXME: there really should be sensible tests for the network handler
  */
+@RunWith(Parameterized.class)
 public class NetworkHandlerTest {
     private static final Logger LOG = LoggerFactory.getLogger(NetworkHandlerTest.class);
     private static NetworkAddress peerAddress = new NetworkAddress.Builder().ipv4(127, 0, 0, 1).port(6001).build();
@@ -51,7 +61,27 @@ public class NetworkHandlerTest {
 
     private BitmessageContext peer;
     private BitmessageContext node;
-    private NetworkHandler networkHandler;
+
+    private final NetworkHandler peerNetworkHandler;
+    private final NetworkHandler nodeNetworkHandler;
+
+    @Rule
+    public final TestRule timeout = new DisableOnDebug(Timeout.seconds(5));
+
+    public NetworkHandlerTest(NetworkHandler peer, NetworkHandler node) {
+        this.peerNetworkHandler = peer;
+        this.nodeNetworkHandler = node;
+    }
+
+    @Parameterized.Parameters
+    public static List<Object[]> parameters() {
+        return Arrays.asList(new Object[][]{
+                {new DefaultNetworkHandler(), new DefaultNetworkHandler()},
+                {new DefaultNetworkHandler(), new NioNetworkHandler()},
+                {new NioNetworkHandler(), new DefaultNetworkHandler()},
+                {new NioNetworkHandler(), new NioNetworkHandler()}
+        });
+    }
 
     @Before
     public void setUp() {
@@ -63,7 +93,7 @@ public class NetworkHandlerTest {
                 .powRepo(mock(ProofOfWorkRepository.class))
                 .port(peerAddress.getPort())
                 .nodeRegistry(new TestNodeRegistry())
-                .networkHandler(new DefaultNetworkHandler())
+                .networkHandler(peerNetworkHandler)
                 .cryptography(new BouncyCryptography())
                 .listener(mock(BitmessageContext.Listener.class))
                 .customCommandHandler(new CustomCommandHandler() {
@@ -90,7 +120,6 @@ public class NetworkHandlerTest {
         peer.startup();
 
         nodeInventory = new TestInventory();
-        networkHandler = new DefaultNetworkHandler();
         node = new BitmessageContext.Builder()
                 .addressRepo(mock(AddressRepository.class))
                 .inventory(nodeInventory)
@@ -98,7 +127,7 @@ public class NetworkHandlerTest {
                 .powRepo(mock(ProofOfWorkRepository.class))
                 .port(6002)
                 .nodeRegistry(new TestNodeRegistry(peerAddress))
-                .networkHandler(networkHandler)
+                .networkHandler(nodeNetworkHandler)
                 .cryptography(new BouncyCryptography())
                 .listener(mock(BitmessageContext.Listener.class))
                 .build();
@@ -108,7 +137,7 @@ public class NetworkHandlerTest {
     public void cleanUp() {
         shutdown(peer);
         shutdown(node);
-        shutdown(networkHandler);
+        shutdown(nodeNetworkHandler);
     }
 
     private static void shutdown(BitmessageContext ctx) {
@@ -140,7 +169,7 @@ public class NetworkHandlerTest {
         } while (networkHandler.isRunning());
     }
 
-    @Test(timeout = 5_000)
+    @Test
     public void ensureNodesAreConnecting() throws Exception {
         node.startup();
         Property status;
@@ -151,14 +180,14 @@ public class NetworkHandlerTest {
         assertEquals(1, status.getProperty("outgoing").getValue());
     }
 
-    @Test(timeout = 5_000)
+    @Test
     public void ensureCustomMessageIsSentAndResponseRetrieved() throws Exception {
         byte[] data = cryptography().randomBytes(8);
         data[0] = (byte) 1;
         CustomMessage request = new CustomMessage("test request", data);
         node.startup();
 
-        CustomMessage response = networkHandler.send(peerAddress.toInetAddress(), peerAddress.getPort(), request);
+        CustomMessage response = nodeNetworkHandler.send(peerAddress.toInetAddress(), peerAddress.getPort(), request);
 
         assertThat(response, notNullValue());
         assertThat(response.getCustomCommand(), is("test response"));
@@ -172,14 +201,14 @@ public class NetworkHandlerTest {
         CustomMessage request = new CustomMessage("test request", data);
         node.startup();
 
-        CustomMessage response = networkHandler.send(peerAddress.toInetAddress(), peerAddress.getPort(), request);
+        CustomMessage response = nodeNetworkHandler.send(peerAddress.toInetAddress(), peerAddress.getPort(), request);
 
         assertThat(response, notNullValue());
         assertThat(response.getCustomCommand(), is("test response"));
         assertThat(response.getData(), is(request.getData()));
     }
 
-    @Test(timeout = 5_000)
+    @Test
     public void ensureObjectsAreSynchronizedIfBothHaveObjects() throws Exception {
         peerInventory.init(
                 "V4Pubkey.payload",
@@ -191,7 +220,7 @@ public class NetworkHandlerTest {
                 "V4Pubkey.payload"
         );
 
-        Future<?> future = networkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
+        Future<?> future = nodeNetworkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
                 mock(NetworkHandler.MessageListener.class),
                 10);
         future.get();
@@ -199,7 +228,7 @@ public class NetworkHandlerTest {
         assertInventorySize(3, peerInventory);
     }
 
-    @Test(timeout = 5_000)
+    @Test
     public void ensureObjectsAreSynchronizedIfOnlyPeerHasObjects() throws Exception {
         peerInventory.init(
                 "V4Pubkey.payload",
@@ -208,7 +237,7 @@ public class NetworkHandlerTest {
 
         nodeInventory.init();
 
-        Future<?> future = networkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
+        Future<?> future = nodeNetworkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
                 mock(NetworkHandler.MessageListener.class),
                 10);
         future.get();
@@ -216,7 +245,7 @@ public class NetworkHandlerTest {
         assertInventorySize(2, peerInventory);
     }
 
-    @Test(timeout = 5_000)
+    @Test
     public void ensureObjectsAreSynchronizedIfOnlyNodeHasObjects() throws Exception {
         peerInventory.init();
 
@@ -224,7 +253,7 @@ public class NetworkHandlerTest {
                 "V1Msg.payload"
         );
 
-        Future<?> future = networkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
+        Future<?> future = nodeNetworkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
                 mock(NetworkHandler.MessageListener.class),
                 10);
         future.get();
diff --git a/wif/build.gradle b/wif/build.gradle
index 93a0248..0c1ae14 100644
--- a/wif/build.gradle
+++ b/wif/build.gradle
@@ -13,7 +13,7 @@ uploadArchives {
 dependencies {
     compile project(':core')
     compile 'org.ini4j:ini4j:0.5.4'
-    testCompile 'junit:junit:4.11'
+    testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile project(':cryptography-bc')
 }

From ae2120675f86148f186a9a35a5499f0cd4823227 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Sat, 18 Jun 2016 23:09:23 +0200
Subject: [PATCH 58/87] Tests with NioNetworkHandler as peer work now

---
 .../networking/AbstractConnection.java        | 36 ++++++++++++++++++-
 .../bitmessage/networking/Connection.java     | 32 +----------------
 .../networking/nio/ConnectionInfo.java        | 13 +++++--
 .../networking/nio/NioNetworkHandler.java     | 29 ++++++++-------
 .../networking/NetworkHandlerTest.java        |  3 +-
 5 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
index 54897cb..7f7b6ec 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
@@ -60,6 +60,9 @@ public abstract class AbstractConnection {
     protected volatile State state;
     protected long lastObjectTime;
 
+    private final long syncTimeout;
+    private int readTimeoutCounter;
+
     protected long peerNonce;
     protected int version;
     protected long[] streams;
@@ -70,12 +73,13 @@ public abstract class AbstractConnection {
                               NetworkAddress node,
                               NetworkHandler.MessageListener listener,
                               Set<InventoryVector> commonRequestedObjects,
-                              boolean threadsafe) {
+                              long syncTimeout, boolean threadsafe) {
         this.ctx = context;
         this.mode = mode;
         this.host = new NetworkAddress.Builder().ipv6(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0).port(0).build();
         this.node = node;
         this.listener = listener;
+        this.syncTimeout = (syncTimeout > 0 ? UnixTime.now(+syncTimeout) : 0);
         if (threadsafe) {
             this.ivCache = new ConcurrentHashMap<>();
             this.sendingQueue = new ConcurrentLinkedDeque<>();
@@ -107,6 +111,9 @@ public abstract class AbstractConnection {
                 receiveMessage(payload);
                 break;
 
+            case DISCONNECTED:
+                break;
+
             default:
                 handleCommand(payload);
                 break;
@@ -283,6 +290,33 @@ public abstract class AbstractConnection {
         }
     }
 
+    @SuppressWarnings("RedundantIfStatement")
+    protected boolean syncFinished(NetworkMessage msg) {
+        if (mode != SYNC) {
+            return false;
+        }
+        if (Thread.interrupted()) {
+            return true;
+        }
+        if (state != ACTIVE) {
+            return false;
+        }
+        if (syncTimeout < UnixTime.now()) {
+            LOG.info("Synchronization timed out");
+            return true;
+        }
+        if (msg == null) {
+            if (requestedObjects.isEmpty() && sendingQueue.isEmpty())
+                return true;
+
+            readTimeoutCounter++;
+            return readTimeoutCounter > 1;
+        } else {
+            readTimeoutCounter = 0;
+            return false;
+        }
+    }
+
     public void disconnect() {
         state = DISCONNECTED;
 
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
index 3fe1b62..d9cb2cc 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
@@ -56,13 +56,11 @@ class Connection extends AbstractConnection {
 
     private final long startTime;
     private final Socket socket;
-    private final long syncTimeout;
     private final ReaderRunnable reader = new ReaderRunnable();
     private final WriterRunnable writer = new WriterRunnable();
 
     private InputStream in;
     private OutputStream out;
-    private int readTimeoutCounter;
     private boolean socketInitialized;
 
     public Connection(InternalContext context, Mode mode, Socket socket, MessageListener listener,
@@ -80,10 +78,9 @@ class Connection extends AbstractConnection {
 
     private Connection(InternalContext context, Mode mode, MessageListener listener, Socket socket,
                        Set<InventoryVector> commonRequestedObjects, NetworkAddress node, long syncTimeout) {
-        super(context, mode, node, listener, commonRequestedObjects, true);
+        super(context, mode, node, listener, commonRequestedObjects, syncTimeout, true);
         this.startTime = UnixTime.now();
         this.socket = socket;
-        this.syncTimeout = (syncTimeout > 0 ? UnixTime.now(+syncTimeout) : 0);
     }
 
     public static Connection sync(InternalContext ctx, InetAddress address, int port, MessageListener listener,
@@ -110,33 +107,6 @@ class Connection extends AbstractConnection {
         return node;
     }
 
-    @SuppressWarnings("RedundantIfStatement")
-    private boolean syncFinished(NetworkMessage msg) {
-        if (mode != SYNC) {
-            return false;
-        }
-        if (Thread.interrupted()) {
-            return true;
-        }
-        if (state != ACTIVE) {
-            return false;
-        }
-        if (syncTimeout < UnixTime.now()) {
-            LOG.info("Synchronization timed out");
-            return true;
-        }
-        if (msg == null) {
-            if (requestedObjects.isEmpty() && sendingQueue.isEmpty())
-                return true;
-
-            readTimeoutCounter++;
-            return readTimeoutCounter > 1;
-        } else {
-            readTimeoutCounter = 0;
-            return false;
-        }
-    }
-
     @Override
     protected void send(MessagePayload payload) {
         try {
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
index 36bb463..1626c87 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
@@ -42,11 +42,12 @@ public class ConnectionInfo extends AbstractConnection {
     private ByteBuffer in = ByteBuffer.allocate(MAX_MESSAGE_SIZE);
     private ByteBuffer out = ByteBuffer.allocate(MAX_MESSAGE_SIZE);
     private V3MessageReader reader = new V3MessageReader();
+    private boolean syncFinished;
 
     public ConnectionInfo(InternalContext context, Mode mode,
                           NetworkAddress node, NetworkHandler.MessageListener listener,
-                          Set<InventoryVector> commonRequestedObjects) {
-        super(context, mode, node, listener, commonRequestedObjects, false);
+                          Set<InventoryVector> commonRequestedObjects, long syncTimeout) {
+        super(context, mode, node, listener, commonRequestedObjects, syncTimeout, false);
         out.flip();
         if (mode == CLIENT || mode == SYNC) {
             send(new Version.Builder().defaults(peerNonce).addrFrom(host).addrRecv(node).build());
@@ -77,14 +78,20 @@ public class ConnectionInfo extends AbstractConnection {
         reader.update(in);
         if (!reader.getMessages().isEmpty()) {
             Iterator<NetworkMessage> iterator = reader.getMessages().iterator();
+            NetworkMessage msg = null;
             while (iterator.hasNext()) {
-                NetworkMessage msg = iterator.next();
+                msg = iterator.next();
                 handleMessage(msg.getPayload());
                 iterator.remove();
             }
+            syncFinished = syncFinished(msg);
         }
     }
 
+    public boolean isSyncFinished() {
+        return syncFinished;
+    }
+
     @Override
     protected void send(MessagePayload payload) {
         sendingQueue.add(payload);
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index cfb6c2e..c7b4412 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -43,6 +43,7 @@ import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.CLIENT;
 import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SERVER;
 import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SYNC;
 import static ch.dissem.bitmessage.networking.AbstractConnection.State.ACTIVE;
+import static ch.dissem.bitmessage.networking.AbstractConnection.State.DISCONNECTED;
 import static ch.dissem.bitmessage.utils.DebugUtils.inc;
 import static ch.dissem.bitmessage.utils.ThreadFactoryBuilder.pool;
 import static java.nio.channels.SelectionKey.OP_READ;
@@ -65,7 +66,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
     private ServerSocketChannel serverChannel;
 
     @Override
-    public Future<Void> synchronize(final InetAddress server, final int port, final MessageListener listener, long timeoutInSeconds) {
+    public Future<Void> synchronize(final InetAddress server, final int port, final MessageListener listener, final long timeoutInSeconds) {
         return pool.submit(new Callable<Void>() {
             @Override
             public Void call() throws Exception {
@@ -75,11 +76,9 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                     channel.configureBlocking(false);
                     ConnectionInfo connection = new ConnectionInfo(ctx, SYNC,
                             new NetworkAddress.Builder().ip(server).port(port).stream(1).build(),
-                            listener, new HashSet<InventoryVector>());
+                            listener, new HashSet<InventoryVector>(), timeoutInSeconds);
                     while (channel.isConnected() &&
-                            (connection.getState() != ACTIVE
-                                    || connection.getSendingQueue().isEmpty()
-                                    || requestedObjects.isEmpty())) {
+                            (connection.getState() != ACTIVE || connection.isSyncFinished())) {
                         write(requestedObjects, channel, connection);
                         read(channel, connection);
                         Thread.sleep(10);
@@ -138,7 +137,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
             throw new ApplicationException(e);
         }
         final Set<InventoryVector> requestedObjects = new HashSet<>();
-        start("connection listener", new Runnable() {
+        thread("connection listener", new Runnable() {
             @Override
             public void run() {
                 try {
@@ -152,9 +151,10 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                                     new ConnectionInfo(ctx, SERVER,
                                             new NetworkAddress.Builder().address(accepted.getRemoteAddress()).stream(1).build(),
                                             listener,
-                                            requestedObjects
+                                            requestedObjects, 0
                                     ));
                         } catch (AsynchronousCloseException ignore) {
+                            LOG.trace(ignore.getMessage());
                         } catch (IOException e) {
                             LOG.error(e.getMessage(), e);
                         }
@@ -169,7 +169,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
             }
         });
 
-        start("connection starter", new Runnable() {
+        thread("connection starter", new Runnable() {
             @Override
             public void run() {
                 while (selector.isOpen()) {
@@ -184,7 +184,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                                     new ConnectionInfo(ctx, CLIENT,
                                             address,
                                             listener,
-                                            requestedObjects
+                                            requestedObjects, 0
                                     ));
                         } catch (AsynchronousCloseException ignore) {
                         } catch (IOException e) {
@@ -200,7 +200,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
             }
         });
 
-        start("processor", new Runnable() {
+        thread("processor", new Runnable() {
             @Override
             public void run() {
                 try {
@@ -220,7 +220,12 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                                     read(channel, connection);
                                 }
                                 if (connection.getSendingQueue().isEmpty()) {
-                                    key.interestOps(OP_READ);
+                                    if (connection.getState() == DISCONNECTED) {
+                                        key.interestOps(0);
+                                        key.channel().close();
+                                    } else {
+                                        key.interestOps(OP_READ);
+                                    }
                                 } else {
                                     key.interestOps(OP_READ | OP_WRITE);
                                 }
@@ -269,7 +274,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
         }
     }
 
-    private void start(String threadName, Runnable runnable) {
+    private void thread(String threadName, Runnable runnable) {
         Thread thread = new Thread(runnable, threadName);
         thread.setDaemon(true);
         thread.setPriority(Thread.MIN_PRIORITY);
diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index 1b7994a..cc0fc04 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -194,12 +194,11 @@ public class NetworkHandlerTest {
         assertThat(response.getData(), is(data));
     }
 
-    @Test(timeout = 5_000, expected = NodeException.class)
+    @Test(expected = NodeException.class)
     public void ensureCustomMessageWithoutResponseYieldsException() throws Exception {
         byte[] data = cryptography().randomBytes(8);
         data[0] = (byte) 0;
         CustomMessage request = new CustomMessage("test request", data);
-        node.startup();
 
         CustomMessage response = nodeNetworkHandler.send(peerAddress.toInetAddress(), peerAddress.getPort(), request);
 

From abc2f63aa6abcae08c3b371f8e62f1afe03884dd Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 20 Jun 2016 16:33:47 +0200
Subject: [PATCH 59/87] Some further fixes and improvements, not all tests
 working yet

---
 .../java/ch/dissem/bitmessage/SystemTest.java | 26 ++++++++++++-
 .../networking/AbstractConnection.java        |  5 ++-
 .../networking/nio/ConnectionInfo.java        |  6 +++
 .../networking/nio/NioNetworkHandler.java     | 38 +++++++++++--------
 .../networking/NetworkHandlerTest.java        |  2 +-
 5 files changed, 58 insertions(+), 19 deletions(-)

diff --git a/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java b/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
index f2f02f2..dac6f74 100644
--- a/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
+++ b/demo/src/test/java/ch/dissem/bitmessage/SystemTest.java
@@ -4,17 +4,23 @@ import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.networking.DefaultNetworkHandler;
+import ch.dissem.bitmessage.networking.nio.NioNetworkHandler;
 import ch.dissem.bitmessage.ports.DefaultLabeler;
 import ch.dissem.bitmessage.ports.Labeler;
+import ch.dissem.bitmessage.ports.NetworkHandler;
 import ch.dissem.bitmessage.repository.*;
 import ch.dissem.bitmessage.utils.TTL;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
@@ -27,8 +33,11 @@ import static org.mockito.Matchers.any;
 /**
  * @author Christian Basler
  */
+@RunWith(Parameterized.class)
 public class SystemTest {
     private static int port = 6000;
+    private final NetworkHandler aliceNetworkHandler;
+    private final NetworkHandler bobNetworkHandler;
 
     private BitmessageContext alice;
     private TestListener aliceListener = new TestListener();
@@ -39,6 +48,19 @@ public class SystemTest {
     private TestListener bobListener = new TestListener();
     private BitmessageAddress bobIdentity;
 
+    public SystemTest(NetworkHandler peer, NetworkHandler node) {
+        this.aliceNetworkHandler = peer;
+        this.bobNetworkHandler = node;
+    }
+
+    @Parameterized.Parameters
+    public static List<Object[]> parameters() {
+        return Arrays.asList(new Object[][]{
+                {new NioNetworkHandler(), new DefaultNetworkHandler()},
+                {new NioNetworkHandler(), new NioNetworkHandler()}
+        });
+    }
+
     @Before
     public void setUp() {
         int alicePort = port++;
@@ -54,7 +76,7 @@ public class SystemTest {
                 .powRepo(new JdbcProofOfWorkRepository(aliceDB))
                 .port(alicePort)
                 .nodeRegistry(new TestNodeRegistry(bobPort))
-                .networkHandler(new DefaultNetworkHandler())
+                .networkHandler(aliceNetworkHandler)
                 .cryptography(new BouncyCryptography())
                 .listener(aliceListener)
                 .labeler(aliceLabeler)
@@ -70,7 +92,7 @@ public class SystemTest {
                 .powRepo(new JdbcProofOfWorkRepository(bobDB))
                 .port(bobPort)
                 .nodeRegistry(new TestNodeRegistry(alicePort))
-                .networkHandler(new DefaultNetworkHandler())
+                .networkHandler(bobNetworkHandler)
                 .cryptography(new BouncyCryptography())
                 .listener(bobListener)
                 .labeler(new DebugLabeler("Bob"))
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
index 7f7b6ec..ac80aff 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
@@ -305,8 +305,11 @@ public abstract class AbstractConnection {
             LOG.info("Synchronization timed out");
             return true;
         }
+        if (!sendingQueue.isEmpty()) {
+            return false;
+        }
         if (msg == null) {
-            if (requestedObjects.isEmpty() && sendingQueue.isEmpty())
+            if (requestedObjects.isEmpty())
                 return true;
 
             readTimeoutCounter++;
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
index 1626c87..afe3d14 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
@@ -88,6 +88,12 @@ public class ConnectionInfo extends AbstractConnection {
         }
     }
 
+    public void updateSyncStatus() {
+        if (!syncFinished) {
+            syncFinished = reader.getMessages().isEmpty() && syncFinished(null);
+        }
+    }
+
     public boolean isSyncFinished() {
         return syncFinished;
     }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index c7b4412..5e6f056 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -77,12 +77,12 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                     ConnectionInfo connection = new ConnectionInfo(ctx, SYNC,
                             new NetworkAddress.Builder().ip(server).port(port).stream(1).build(),
                             listener, new HashSet<InventoryVector>(), timeoutInSeconds);
-                    while (channel.isConnected() &&
-                            (connection.getState() != ACTIVE || connection.isSyncFinished())) {
+                    while (channel.isConnected() && !connection.isSyncFinished()) {
                         write(requestedObjects, channel, connection);
                         read(channel, connection);
                         Thread.sleep(10);
                     }
+                    LOG.info("Synchronization finished");
                 }
                 return null;
             }
@@ -95,28 +95,34 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
             channel.configureBlocking(true);
             ByteBuffer buffer = ByteBuffer.allocate(MAX_MESSAGE_SIZE);
             new NetworkMessage(request).write(buffer);
+            buffer.flip();
             while (buffer.hasRemaining()) {
                 channel.write(buffer);
             }
             buffer.clear();
 
             V3MessageReader reader = new V3MessageReader();
-            while (reader.getMessages().isEmpty()) {
-                channel.read(buffer);
-                buffer.flip();
-                reader.update(buffer);
+            while (channel.isConnected() && reader.getMessages().isEmpty()) {
+                if (channel.read(buffer) > 0) {
+                    buffer.flip();
+                    reader.update(buffer);
+                    buffer.compact();
+                } else {
+                    throw new NodeException("No response from node " + server);
+                }
+            }
+            NetworkMessage networkMessage;
+            if (reader.getMessages().isEmpty()) {
+                throw new NodeException("No response from node " + server);
+            } else {
+                networkMessage = reader.getMessages().get(0);
             }
-            NetworkMessage networkMessage = reader.getMessages().get(0);
 
             if (networkMessage != null && networkMessage.getPayload() instanceof CustomMessage) {
                 return (CustomMessage) networkMessage.getPayload();
             } else {
-                if (networkMessage == null) {
-                    throw new NodeException("No response from node " + server);
-                } else {
-                    throw new NodeException("Unexpected response from node " +
-                            server + ": " + networkMessage.getPayload().getCommand());
-                }
+                throw new NodeException("Unexpected response from node " +
+                        server + ": " + networkMessage.getPayload().getCommand());
             }
         } catch (IOException e) {
             throw new ApplicationException(e);
@@ -272,6 +278,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
             connection.updateReader();
             buffer.compact();
         }
+        connection.updateSyncStatus();
     }
 
     private void thread(String threadName, Runnable runnable) {
@@ -285,8 +292,9 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
     public void stop() {
         try {
             serverChannel.socket().close();
-            for (SelectionKey key : selector.keys()) {
-                key.channel().close();
+            Iterator<SelectionKey> iterator = selector.keys().iterator();
+            while (iterator.hasNext()) {
+                iterator.next().channel().close();
             }
             selector.close();
         } catch (IOException e) {
diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index cc0fc04..24cedf7 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -254,7 +254,7 @@ public class NetworkHandlerTest {
 
         Future<?> future = nodeNetworkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
                 mock(NetworkHandler.MessageListener.class),
-                10);
+                100);
         future.get();
         assertInventorySize(1, nodeInventory);
         assertInventorySize(1, peerInventory);

From d130080df223a201aca925230335c6c62ce32f2c Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 8 Jul 2016 18:14:41 +0200
Subject: [PATCH 60/87] Implemented methods offer and request, system test
 works now but synchronization is still broken.

---
 .../networking/AbstractConnection.java        |   3 +-
 .../networking/nio/NioNetworkHandler.java     | 131 +++++++++++++-----
 .../networking/NetworkHandlerTest.java        |   2 +-
 .../repository/JdbcMessageRepository.java     |   2 +-
 4 files changed, 100 insertions(+), 38 deletions(-)

diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
index ac80aff..f7d6fc3 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
@@ -82,13 +82,12 @@ public abstract class AbstractConnection {
         this.syncTimeout = (syncTimeout > 0 ? UnixTime.now(+syncTimeout) : 0);
         if (threadsafe) {
             this.ivCache = new ConcurrentHashMap<>();
-            this.sendingQueue = new ConcurrentLinkedDeque<>();
             this.requestedObjects = Collections.newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(10_000));
         } else {
             this.ivCache = new HashMap<>();
-            this.sendingQueue = new LinkedList<>();
             this.requestedObjects = new HashSet<>();
         }
+        this.sendingQueue = new ConcurrentLinkedDeque<>();
         this.state = CONNECTING;
         this.commonRequestedObjects = commonRequestedObjects;
     }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index 5e6f056..096c229 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -37,17 +37,21 @@ import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.*;
 import java.util.*;
-import java.util.concurrent.*;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 
-import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.CLIENT;
-import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SERVER;
-import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SYNC;
+import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.*;
 import static ch.dissem.bitmessage.networking.AbstractConnection.State.ACTIVE;
 import static ch.dissem.bitmessage.networking.AbstractConnection.State.DISCONNECTED;
+import static ch.dissem.bitmessage.utils.Collections.selectRandom;
 import static ch.dissem.bitmessage.utils.DebugUtils.inc;
 import static ch.dissem.bitmessage.utils.ThreadFactoryBuilder.pool;
 import static java.nio.channels.SelectionKey.OP_READ;
 import static java.nio.channels.SelectionKey.OP_WRITE;
+import static java.util.Collections.newSetFromMap;
+import static java.util.Collections.synchronizedSet;
 
 /**
  * Network handler using java.nio, resulting in less threads.
@@ -64,6 +68,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
     private InternalContext ctx;
     private Selector selector;
     private ServerSocketChannel serverChannel;
+    private Set<ConnectionInfo> connections = synchronizedSet(newSetFromMap(new WeakHashMap<ConnectionInfo, Boolean>()));
 
     @Override
     public Future<Void> synchronize(final InetAddress server, final int port, final MessageListener listener, final long timeoutInSeconds) {
@@ -77,6 +82,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                     ConnectionInfo connection = new ConnectionInfo(ctx, SYNC,
                             new NetworkAddress.Builder().ip(server).port(port).stream(1).build(),
                             listener, new HashSet<InventoryVector>(), timeoutInSeconds);
+                    connections.add(connection);
                     while (channel.isConnected() && !connection.isSyncFinished()) {
                         write(requestedObjects, channel, connection);
                         read(channel, connection);
@@ -121,8 +127,12 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
             if (networkMessage != null && networkMessage.getPayload() instanceof CustomMessage) {
                 return (CustomMessage) networkMessage.getPayload();
             } else {
-                throw new NodeException("Unexpected response from node " +
-                        server + ": " + networkMessage.getPayload().getCommand());
+                if (networkMessage == null || networkMessage.getPayload() == null) {
+                    throw new NodeException("Empty response from node " + server);
+                } else {
+                    throw new NodeException("Unexpected response from node " + server + ": "
+                            + networkMessage.getPayload().getClass());
+                }
             }
         } catch (IOException e) {
             throw new ApplicationException(e);
@@ -153,12 +163,13 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                         try {
                             SocketChannel accepted = serverChannel.accept();
                             accepted.configureBlocking(false);
-                            accepted.register(selector, OP_READ | OP_WRITE,
-                                    new ConnectionInfo(ctx, SERVER,
-                                            new NetworkAddress.Builder().address(accepted.getRemoteAddress()).stream(1).build(),
-                                            listener,
-                                            requestedObjects, 0
-                                    ));
+                            ConnectionInfo connection = new ConnectionInfo(ctx, SERVER,
+                                    new NetworkAddress.Builder().address(accepted.getRemoteAddress()).stream(1).build(),
+                                    listener,
+                                    requestedObjects, 0
+                            );
+                            accepted.register(selector, OP_READ | OP_WRITE, connection);
+                            connections.add(connection);
                         } catch (AsynchronousCloseException ignore) {
                             LOG.trace(ignore.getMessage());
                         } catch (IOException e) {
@@ -186,12 +197,13 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                             SocketChannel channel = SocketChannel.open(
                                     new InetSocketAddress(address.toInetAddress(), address.getPort()));
                             channel.configureBlocking(false);
-                            channel.register(selector, OP_READ | OP_WRITE,
-                                    new ConnectionInfo(ctx, CLIENT,
-                                            address,
-                                            listener,
-                                            requestedObjects, 0
-                                    ));
+                            ConnectionInfo connection = new ConnectionInfo(ctx, CLIENT,
+                                    address,
+                                    listener,
+                                    requestedObjects, 0
+                            );
+                            channel.register(selector, OP_READ | OP_WRITE, connection);
+                            connections.add(connection);
                         } catch (AsynchronousCloseException ignore) {
                         } catch (IOException e) {
                             LOG.error(e.getMessage(), e);
@@ -235,6 +247,9 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                                 } else {
                                     key.interestOps(OP_READ | OP_WRITE);
                                 }
+                                if (connection.getState() == DISCONNECTED) {
+                                    connections.remove(connection);
+                                }
                             }
                             keyIterator.remove();
                         }
@@ -292,9 +307,8 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
     public void stop() {
         try {
             serverChannel.socket().close();
-            Iterator<SelectionKey> iterator = selector.keys().iterator();
-            while (iterator.hasNext()) {
-                iterator.next().channel().close();
+            for (SelectionKey selectionKey : selector.keys()) {
+                selectionKey.channel().close();
             }
             selector.close();
         } catch (IOException e) {
@@ -304,12 +318,64 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
 
     @Override
     public void offer(InventoryVector iv) {
-        // TODO
+        List<ConnectionInfo> target = new LinkedList<>();
+        for (ConnectionInfo connection : connections) {
+            if (connection.getState() == ACTIVE && !connection.knowsOf(iv)) {
+                target.add(connection);
+            }
+        }
+        List<ConnectionInfo> randomSubset = selectRandom(NETWORK_MAGIC_NUMBER, target);
+        for (ConnectionInfo connection : randomSubset) {
+            connection.offer(iv);
+        }
     }
 
     @Override
     public void request(Collection<InventoryVector> inventoryVectors) {
-        // TODO
+        if (!isRunning()) return;
+        Iterator<InventoryVector> iterator = inventoryVectors.iterator();
+        if (!iterator.hasNext()) {
+            return;
+        }
+
+        Map<ConnectionInfo, List<InventoryVector>> distribution = new HashMap<>();
+        for (ConnectionInfo connection : connections) {
+            if (connection.getState() == ACTIVE) {
+                distribution.put(connection, new LinkedList<InventoryVector>());
+            }
+        }
+        InventoryVector next = iterator.next();
+        ConnectionInfo previous = null;
+        do {
+            for (ConnectionInfo connection : distribution.keySet()) {
+                if (connection == previous) {
+                    next = iterator.next();
+                }
+                if (connection.knowsOf(next)) {
+                    List<InventoryVector> ivs = distribution.get(connection);
+                    if (ivs.size() == GetData.MAX_INVENTORY_SIZE) {
+                        connection.send(new GetData.Builder().inventory(ivs).build());
+                        ivs.clear();
+                    }
+                    ivs.add(next);
+                    iterator.remove();
+
+                    if (iterator.hasNext()) {
+                        next = iterator.next();
+                        previous = connection;
+                    } else {
+                        break;
+                    }
+                }
+            }
+        } while (iterator.hasNext());
+
+        for (ConnectionInfo connection : distribution.keySet()) {
+            List<InventoryVector> ivs = distribution.get(connection);
+            if (!ivs.isEmpty()) {
+                connection.send(new GetData.Builder().inventory(ivs).build());
+            }
+        }
     }
 
     @Override
@@ -318,17 +384,14 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
         TreeMap<Long, Integer> incomingConnections = new TreeMap<>();
         TreeMap<Long, Integer> outgoingConnections = new TreeMap<>();
 
-        for (SelectionKey key : selector.keys()) {
-            if (key.attachment() instanceof ConnectionInfo) {
-                ConnectionInfo connection = (ConnectionInfo) key.attachment();
-                if (connection.getState() == ACTIVE) {
-                    long stream = connection.getNode().getStream();
-                    streams.add(stream);
-                    if (connection.getMode() == SERVER) {
-                        inc(incomingConnections, stream);
-                    } else {
-                        inc(outgoingConnections, stream);
-                    }
+        for (ConnectionInfo connection : connections) {
+            if (connection.getState() == ACTIVE) {
+                long stream = connection.getNode().getStream();
+                streams.add(stream);
+                if (connection.getMode() == SERVER) {
+                    inc(incomingConnections, stream);
+                } else {
+                    inc(outgoingConnections, stream);
                 }
             }
         }
diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index 24cedf7..85dec9e 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -66,7 +66,7 @@ public class NetworkHandlerTest {
     private final NetworkHandler nodeNetworkHandler;
 
     @Rule
-    public final TestRule timeout = new DisableOnDebug(Timeout.seconds(5));
+    public final TestRule timeout = new DisableOnDebug(Timeout.seconds(10));
 
     public NetworkHandlerTest(NetworkHandler peer, NetworkHandler node) {
         this.peerNetworkHandler = peer;
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
index 403754a..e2e247a 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
@@ -121,7 +121,7 @@ public class JdbcMessageRepository extends AbstractMessageRepository implements
                 builder.retries(rs.getInt("retries"));
                 builder.nextTry(rs.getLong("next_try"));
                 builder.labels(findLabels(connection,
-                        "WHERE id IN (SELECT label_id FROM Message_Label WHERE message_id=" + id + ") ORDER BY ord"));
+                        "id IN (SELECT label_id FROM Message_Label WHERE message_id=" + id + ") ORDER BY ord"));
                 Plaintext message = builder.build();
                 message.setInitialHash(rs.getBytes("initial_hash"));
                 result.add(message);

From 50f2c7e0809251344f3d78a9969a6675cb80bd50 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Sat, 9 Jul 2016 16:37:12 +0200
Subject: [PATCH 61/87] Fixed synchronisation

---
 .../bitmessage/networking/AbstractConnection.java     | 11 ++++-------
 .../bitmessage/networking/nio/NioNetworkHandler.java  | 11 +++++++++--
 .../bitmessage/networking/NetworkHandlerTest.java     |  2 +-
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
index f7d6fc3..edb26a2 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
@@ -61,7 +61,7 @@ public abstract class AbstractConnection {
     protected long lastObjectTime;
 
     private final long syncTimeout;
-    private int readTimeoutCounter;
+    private long syncReadTimeout = Long.MAX_VALUE;
 
     protected long peerNonce;
     protected int version;
@@ -305,16 +305,13 @@ public abstract class AbstractConnection {
             return true;
         }
         if (!sendingQueue.isEmpty()) {
+            syncReadTimeout = System.currentTimeMillis() + 1000;
             return false;
         }
         if (msg == null) {
-            if (requestedObjects.isEmpty())
-                return true;
-
-            readTimeoutCounter++;
-            return readTimeoutCounter > 1;
+            return syncReadTimeout < System.currentTimeMillis();
         } else {
-            readTimeoutCounter = 0;
+            syncReadTimeout = System.currentTimeMillis() + 1000;
             return false;
         }
     }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index 096c229..c49d324 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -77,7 +77,6 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
             public Void call() throws Exception {
                 Set<InventoryVector> requestedObjects = new HashSet<>();
                 try (SocketChannel channel = SocketChannel.open(new InetSocketAddress(server, port))) {
-                    channel.finishConnect();
                     channel.configureBlocking(false);
                     ConnectionInfo connection = new ConnectionInfo(ctx, SYNC,
                             new NetworkAddress.Builder().ip(server).port(port).stream(1).build(),
@@ -88,6 +87,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                         read(channel, connection);
                         Thread.sleep(10);
                     }
+                    connections.remove(connection);
                     LOG.info("Synchronization finished");
                 }
                 return null;
@@ -225,7 +225,6 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                     while (selector.isOpen()) {
                         selector.select(1000);
                         Iterator<SelectionKey> keyIterator = selector.selectedKeys().iterator();
-
                         while (keyIterator.hasNext()) {
                             SelectionKey key = keyIterator.next();
                             if (key.attachment() instanceof ConnectionInfo) {
@@ -253,6 +252,14 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                             }
                             keyIterator.remove();
                         }
+                        for (SelectionKey key : selector.keys()) {
+                            if ((key.interestOps() & OP_WRITE) == 0) {
+                                if (key.attachment() instanceof ConnectionInfo &&
+                                        !((ConnectionInfo) key.attachment()).getSendingQueue().isEmpty()) {
+                                    key.interestOps(OP_READ | OP_WRITE);
+                                }
+                            }
+                        }
                     }
                     selector.close();
                 } catch (ClosedSelectorException ignore) {
diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index 85dec9e..444f836 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -254,7 +254,7 @@ public class NetworkHandlerTest {
 
         Future<?> future = nodeNetworkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
                 mock(NetworkHandler.MessageListener.class),
-                100);
+                10);
         future.get();
         assertInventorySize(1, nodeInventory);
         assertInventorySize(1, peerInventory);

From 82ee4d05bb62e00b5c48324d32d9b7c352ff12e2 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Sun, 10 Jul 2016 06:55:24 +0200
Subject: [PATCH 62/87] Raised test timeout, as the Jacoco run seems to be
 considerably slower.

---
 .../ch/dissem/bitmessage/networking/NetworkHandlerTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index 444f836..475cbb1 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -66,7 +66,7 @@ public class NetworkHandlerTest {
     private final NetworkHandler nodeNetworkHandler;
 
     @Rule
-    public final TestRule timeout = new DisableOnDebug(Timeout.seconds(10));
+    public final TestRule timeout = new DisableOnDebug(Timeout.seconds(20));
 
     public NetworkHandlerTest(NetworkHandler peer, NetworkHandler node) {
         this.peerNetworkHandler = peer;

From 48ff975ffd91e38a0d9909e45072d8562b26a5bb Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 25 Jul 2016 07:52:27 +0200
Subject: [PATCH 63/87] Better memory management for the in buffer (the same
 TODO for the out buffer.

---
 .editorconfig                                 |   7 +
 .../dissem/bitmessage/factory/BufferPool.java | 107 +++++++++
 .../bitmessage/factory/V3MessageReader.java   | 166 ++++++++++----
 .../bitmessage/ports/MemoryNodeRegistry.java  |   6 +-
 .../dissem/bitmessage/demo/Application.java   |   4 +-
 .../java/ch/dissem/bitmessage/demo/Main.java  |   4 +-
 .../networking/AbstractConnection.java        |  13 +-
 .../bitmessage/networking/Connection.java     |   2 +-
 .../networking/DefaultNetworkHandler.java     |  24 +-
 .../networking/nio/ConnectionInfo.java        |  50 ++++-
 .../networking/nio/NioNetworkHandler.java     | 212 ++++++++++--------
 11 files changed, 427 insertions(+), 168 deletions(-)
 create mode 100644 .editorconfig
 create mode 100644 core/src/main/java/ch/dissem/bitmessage/factory/BufferPool.java

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..656384c
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_size = 4
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/BufferPool.java b/core/src/main/java/ch/dissem/bitmessage/factory/BufferPool.java
new file mode 100644
index 0000000..15e5856
--- /dev/null
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/BufferPool.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2016 Christian Basler
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ch.dissem.bitmessage.factory;
+
+import ch.dissem.bitmessage.ports.NetworkHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.nio.ByteBuffer;
+import java.util.*;
+
+/**
+ * A pool for {@link ByteBuffer}s. As they may use up a lot of memory,
+ * they should be reused as efficiently as possible.
+ */
+class BufferPool {
+    private static final Logger LOG = LoggerFactory.getLogger(BufferPool.class);
+
+    public static final BufferPool bufferPool = new BufferPool(256, 2048);
+
+    private final Map<Size, Integer> capacities = new EnumMap<>(Size.class);
+    private final Map<Size, Stack<ByteBuffer>> pools = new EnumMap<>(Size.class);
+
+    private BufferPool(int small, int medium) {
+        capacities.put(Size.HEADER, 24);
+        capacities.put(Size.SMALL, small);
+        capacities.put(Size.MEDIUM, medium);
+        capacities.put(Size.LARGE, NetworkHandler.MAX_PAYLOAD_SIZE);
+        pools.put(Size.HEADER, new Stack<ByteBuffer>());
+        pools.put(Size.SMALL, new Stack<ByteBuffer>());
+        pools.put(Size.MEDIUM, new Stack<ByteBuffer>());
+        pools.put(Size.LARGE, new Stack<ByteBuffer>());
+    }
+
+    public synchronized ByteBuffer allocate(int capacity) {
+        Size targetSize = getTargetSize(capacity);
+        Size s = targetSize;
+        do {
+            Stack<ByteBuffer> pool = pools.get(s);
+            if (!pool.isEmpty()) {
+                return pool.pop();
+            }
+            s = s.next();
+        } while (s != null);
+        LOG.debug("Creating new buffer of size " + targetSize);
+        return ByteBuffer.allocate(capacities.get(targetSize));
+    }
+
+    public synchronized ByteBuffer allocate() {
+        Stack<ByteBuffer> pool = pools.get(Size.HEADER);
+        if (!pool.isEmpty()) {
+            return pool.pop();
+        } else {
+            return ByteBuffer.allocate(capacities.get(Size.HEADER));
+        }
+    }
+
+    public synchronized void deallocate(ByteBuffer buffer) {
+        buffer.clear();
+        Size size = getTargetSize(buffer.capacity());
+        if (buffer.capacity() != capacities.get(size)) {
+            throw new IllegalArgumentException("Illegal buffer capacity " + buffer.capacity() +
+                " one of " + capacities.values() + " expected.");
+        }
+        pools.get(size).push(buffer);
+    }
+
+    private Size getTargetSize(int capacity) {
+        for (Size s : Size.values()) {
+            if (capacity <= capacities.get(s)) {
+                return s;
+            }
+        }
+        throw new IllegalArgumentException("Requested capacity too large: " +
+            "requested=" + capacity + "; max=" + capacities.get(Size.LARGE));
+    }
+
+
+    private enum Size {
+        HEADER, SMALL, MEDIUM, LARGE;
+
+        public Size next() {
+            switch (this) {
+                case SMALL:
+                    return MEDIUM;
+                case MEDIUM:
+                    return LARGE;
+                default:
+                    return null;
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
index 80220f1..bb4460f 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
@@ -21,15 +21,20 @@ import ch.dissem.bitmessage.entity.NetworkMessage;
 import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.NodeException;
 import ch.dissem.bitmessage.utils.Decode;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.UUID;
 
 import static ch.dissem.bitmessage.entity.NetworkMessage.MAGIC_BYTES;
+import static ch.dissem.bitmessage.factory.BufferPool.bufferPool;
 import static ch.dissem.bitmessage.ports.NetworkHandler.MAX_PAYLOAD_SIZE;
 import static ch.dissem.bitmessage.utils.Singleton.cryptography;
 
@@ -37,53 +42,89 @@ import static ch.dissem.bitmessage.utils.Singleton.cryptography;
  * Similar to the {@link V3MessageFactory}, but used for NIO buffers which may or may not contain a whole message.
  */
 public class V3MessageReader {
+    private static final Logger LOG = LoggerFactory.getLogger(V3MessageReader.class);
+
+    private ByteBuffer headerBuffer;
+    private ByteBuffer dataBuffer;
+
     private ReaderState state = ReaderState.MAGIC;
     private String command;
     private int length;
     private byte[] checksum;
 
     private List<NetworkMessage> messages = new LinkedList<>();
+    private SizeInfo sizeInfo = new SizeInfo();
 
-    public void update(ByteBuffer buffer) {
-        while (buffer.hasRemaining()) {
-            switch (state) {
-                case MAGIC:
-                    if (!findMagicBytes(buffer)) return;
-                    state = ReaderState.HEADER;
-                case HEADER:
-                    if (buffer.remaining() < 20) {
-                        return;
-                    }
-                    command = getCommand(buffer);
-                    length = (int) Decode.uint32(buffer);
-                    if (length > MAX_PAYLOAD_SIZE) {
-                        throw new NodeException("Payload of " + length + " bytes received, no more than " +
-                                MAX_PAYLOAD_SIZE + " was expected.");
-                    }
-                    checksum = new byte[4];
-                    buffer.get(checksum);
-                    state = ReaderState.DATA;
-                case DATA:
-                    if (buffer.remaining() < length) {
-                        return;
-                    }
-                    if (!testChecksum(buffer)) {
-                        throw new NodeException("Checksum failed for message '" + command + "'");
-                    }
-                    try {
-                        MessagePayload payload = V3MessageFactory.getPayload(
-                                command,
-                                new ByteArrayInputStream(buffer.array(), buffer.arrayOffset() + buffer.position(), length),
-                                length);
-                        if (payload != null) {
-                            messages.add(new NetworkMessage(payload));
-                        }
-                    } catch (IOException e) {
-                        throw new NodeException(e.getMessage());
-                    }
-                    state = ReaderState.MAGIC;
+    public ByteBuffer getActiveBuffer() {
+        if (state != null && state != ReaderState.DATA) {
+            if (headerBuffer == null) {
+                headerBuffer = bufferPool.allocate();
             }
         }
+        return state == ReaderState.DATA ? dataBuffer : headerBuffer;
+    }
+
+    public void update() {
+        if (state != ReaderState.DATA) {
+            getActiveBuffer();
+            headerBuffer.flip();
+        }
+        switch (state) {
+            case MAGIC:
+                if (!findMagicBytes(headerBuffer)) {
+                    headerBuffer.compact();
+                    return;
+                }
+                state = ReaderState.HEADER;
+            case HEADER:
+                if (headerBuffer.remaining() < 20) {
+                    headerBuffer.compact();
+                    headerBuffer.limit(20);
+                    return;
+                }
+                command = getCommand(headerBuffer);
+                length = (int) Decode.uint32(headerBuffer);
+                if (length > MAX_PAYLOAD_SIZE) {
+                    throw new NodeException("Payload of " + length + " bytes received, no more than " +
+                        MAX_PAYLOAD_SIZE + " was expected.");
+                }
+                sizeInfo.add(length); // FIXME: remove this once we have some values to work with
+                checksum = new byte[4];
+                headerBuffer.get(checksum);
+                state = ReaderState.DATA;
+                bufferPool.deallocate(headerBuffer);
+                headerBuffer = null;
+                dataBuffer = bufferPool.allocate(length);
+                dataBuffer.clear();
+                dataBuffer.limit(length);
+            case DATA:
+                if (dataBuffer.position() < length) {
+                    return;
+                } else {
+                    dataBuffer.flip();
+                }
+                if (!testChecksum(dataBuffer)) {
+                    state = ReaderState.MAGIC;
+                    throw new NodeException("Checksum failed for message '" + command + "'");
+                }
+                try {
+                    MessagePayload payload = V3MessageFactory.getPayload(
+                        command,
+                        new ByteArrayInputStream(dataBuffer.array(),
+                            dataBuffer.arrayOffset() + dataBuffer.position(), length),
+                        length);
+                    if (payload != null) {
+                        messages.add(new NetworkMessage(payload));
+                    }
+                } catch (IOException e) {
+                    throw new NodeException(e.getMessage());
+                } finally {
+                    state = ReaderState.MAGIC;
+                    bufferPool.deallocate(dataBuffer);
+                    dataBuffer = null;
+                    dataBuffer = null;
+                }
+        }
     }
 
     public List<NetworkMessage> getMessages() {
@@ -129,7 +170,7 @@ public class V3MessageReader {
 
     private boolean testChecksum(ByteBuffer buffer) {
         byte[] payloadChecksum = cryptography().sha512(buffer.array(),
-                buffer.arrayOffset() + buffer.position(), length);
+            buffer.arrayOffset() + buffer.position(), length);
         for (int i = 0; i < checksum.length; i++) {
             if (checksum[i] != payloadChecksum[i]) {
                 return false;
@@ -138,5 +179,52 @@ public class V3MessageReader {
         return true;
     }
 
+    /**
+     * De-allocates all buffers. This method should be called iff the reader isn't used anymore, i.e. when its
+     * connection is severed.
+     */
+    public void cleanup() {
+        state = null;
+        if (headerBuffer != null) {
+            bufferPool.deallocate(headerBuffer);
+        }
+        if (dataBuffer != null) {
+            bufferPool.deallocate(dataBuffer);
+        }
+    }
+
     private enum ReaderState {MAGIC, HEADER, DATA}
+
+    private class SizeInfo {
+        private FileWriter file;
+        private long min = Long.MAX_VALUE;
+        private long avg = 0;
+        private long max = Long.MIN_VALUE;
+        private long count = 0;
+
+        private SizeInfo() {
+            try {
+                file = new FileWriter("D:/message_size_info-" + UUID.randomUUID() + ".csv");
+            } catch (IOException e) {
+                LOG.error(e.getMessage(), e);
+            }
+        }
+
+        private void add(long length) {
+            avg = (count * avg + length) / (count + 1);
+            if (length < min) {
+                min = length;
+            }
+            if (length > max) {
+                max = length;
+            }
+            count++;
+            LOG.info("Received message with data size " + length + "; Min: " + min + "; Max: " + max + "; Avg: " + avg);
+            try {
+                file.write(length + "\n");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java b/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
index ff2ad95..a56b4ff 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
@@ -87,7 +87,7 @@ public class MemoryNodeRegistry implements NodeRegistry {
                 }
             }
             if (result.isEmpty()) {
-                if (stableNodes.isEmpty()) {
+                if (stableNodes.isEmpty() || stableNodes.get(stream).isEmpty()) {
                     loadStableNodes();
                 }
                 Set<NetworkAddress> nodes = stableNodes.get(stream);
@@ -108,8 +108,8 @@ public class MemoryNodeRegistry implements NodeRegistry {
                     synchronized (knownNodes) {
                         if (!knownNodes.containsKey(node.getStream())) {
                             knownNodes.put(
-                                    node.getStream(),
-                                    newSetFromMap(new ConcurrentHashMap<NetworkAddress, Boolean>())
+                                node.getStream(),
+                                newSetFromMap(new ConcurrentHashMap<NetworkAddress, Boolean>())
                             );
                         }
                     }
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
index 583669b..4f155fa 100644
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
@@ -22,7 +22,7 @@ import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.Label;
-import ch.dissem.bitmessage.networking.DefaultNetworkHandler;
+import ch.dissem.bitmessage.networking.nio.NioNetworkHandler;
 import ch.dissem.bitmessage.ports.MemoryNodeRegistry;
 import ch.dissem.bitmessage.repository.*;
 import org.apache.commons.lang3.text.WordUtils;
@@ -53,7 +53,7 @@ public class Application {
                 .nodeRegistry(new MemoryNodeRegistry())
                 .messageRepo(new JdbcMessageRepository(jdbcConfig))
                 .powRepo(new JdbcProofOfWorkRepository(jdbcConfig))
-                .networkHandler(new DefaultNetworkHandler())
+                .networkHandler(new NioNetworkHandler())
                 .cryptography(new BouncyCryptography())
                 .port(48444)
                 .listener(plaintext -> System.out.println("New Message from " + plaintext.getFrom() + ": " + plaintext.getSubject()))
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
index 2532796..402fa91 100644
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
@@ -18,7 +18,7 @@ package ch.dissem.bitmessage.demo;
 
 import ch.dissem.bitmessage.BitmessageContext;
 import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
-import ch.dissem.bitmessage.networking.DefaultNetworkHandler;
+import ch.dissem.bitmessage.networking.nio.NioNetworkHandler;
 import ch.dissem.bitmessage.ports.MemoryNodeRegistry;
 import ch.dissem.bitmessage.repository.*;
 import ch.dissem.bitmessage.wif.WifExporter;
@@ -53,7 +53,7 @@ public class Main {
                     .nodeRegistry(new MemoryNodeRegistry())
                     .messageRepo(new JdbcMessageRepository(jdbcConfig))
                     .powRepo(new JdbcProofOfWorkRepository(jdbcConfig))
-                    .networkHandler(new DefaultNetworkHandler())
+                    .networkHandler(new NioNetworkHandler())
                     .cryptography(new BouncyCryptography())
                     .port(48444)
                     .build();
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
index edb26a2..73f26f5 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
@@ -73,20 +73,15 @@ public abstract class AbstractConnection {
                               NetworkAddress node,
                               NetworkHandler.MessageListener listener,
                               Set<InventoryVector> commonRequestedObjects,
-                              long syncTimeout, boolean threadsafe) {
+                              long syncTimeout) {
         this.ctx = context;
         this.mode = mode;
         this.host = new NetworkAddress.Builder().ipv6(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0).port(0).build();
         this.node = node;
         this.listener = listener;
         this.syncTimeout = (syncTimeout > 0 ? UnixTime.now(+syncTimeout) : 0);
-        if (threadsafe) {
-            this.ivCache = new ConcurrentHashMap<>();
-            this.requestedObjects = Collections.newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(10_000));
-        } else {
-            this.ivCache = new HashMap<>();
-            this.requestedObjects = new HashSet<>();
-        }
+        this.requestedObjects = Collections.newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(10_000));
+        this.ivCache = new ConcurrentHashMap<>();
         this.sendingQueue = new ConcurrentLinkedDeque<>();
         this.state = CONNECTING;
         this.commonRequestedObjects = commonRequestedObjects;
@@ -177,7 +172,7 @@ public abstract class AbstractConnection {
         } catch (IOException e) {
             LOG.error("Stream " + objectMessage.getStream() + ", object type " + objectMessage.getType() + ": " + e.getMessage(), e);
         } finally {
-            if (commonRequestedObjects.remove(objectMessage.getInventoryVector())) {
+            if (!commonRequestedObjects.remove(objectMessage.getInventoryVector())) {
                 LOG.debug("Received object that wasn't requested.");
             }
         }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
index d9cb2cc..bb5f370 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
@@ -78,7 +78,7 @@ class Connection extends AbstractConnection {
 
     private Connection(InternalContext context, Mode mode, MessageListener listener, Socket socket,
                        Set<InventoryVector> commonRequestedObjects, NetworkAddress node, long syncTimeout) {
-        super(context, mode, node, listener, commonRequestedObjects, syncTimeout, true);
+        super(context, mode, node, listener, commonRequestedObjects, syncTimeout);
         this.startTime = UnixTime.now();
         this.socket = socket;
     }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
index c4a4554..b5f93b1 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
@@ -48,10 +48,10 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
 
     final Collection<Connection> connections = new ConcurrentLinkedQueue<>();
     private final ExecutorService pool = Executors.newCachedThreadPool(
-            pool("network")
-                    .lowPrio()
-                    .daemon()
-                    .build());
+        pool("network")
+            .lowPrio()
+            .daemon()
+            .build());
     private InternalContext ctx;
     private ServerRunnable server;
     private volatile boolean running;
@@ -88,11 +88,11 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
                     throw new NodeException("No response from node " + server);
                 } else {
                     throw new NodeException("Unexpected response from node " +
-                            server + ": " + networkMessage.getPayload().getCommand());
+                        server + ": " + networkMessage.getPayload().getCommand());
                 }
             }
         } catch (IOException e) {
-            throw new ApplicationException(e);
+            throw new NodeException(e.getMessage(), e);
         }
     }
 
@@ -185,16 +185,16 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
             int incoming = incomingConnections.containsKey(stream) ? incomingConnections.get(stream) : 0;
             int outgoing = outgoingConnections.containsKey(stream) ? outgoingConnections.get(stream) : 0;
             streamProperties[i] = new Property("stream " + stream,
-                    null, new Property("nodes", incoming + outgoing),
-                    new Property("incoming", incoming),
-                    new Property("outgoing", outgoing)
+                null, new Property("nodes", incoming + outgoing),
+                new Property("incoming", incoming),
+                new Property("outgoing", outgoing)
             );
             i++;
         }
         return new Property("network", null,
-                new Property("connectionManager", running ? "running" : "stopped"),
-                new Property("connections", null, streamProperties),
-                new Property("requestedObjects", requestedObjects.size())
+            new Property("connectionManager", running ? "running" : "stopped"),
+            new Property("connections", null, streamProperties),
+            new Property("requestedObjects", requestedObjects.size())
         );
     }
 
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
index afe3d14..ed0462d 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
@@ -17,11 +17,13 @@
 package ch.dissem.bitmessage.networking.nio;
 
 import ch.dissem.bitmessage.InternalContext;
+import ch.dissem.bitmessage.entity.GetData;
 import ch.dissem.bitmessage.entity.MessagePayload;
 import ch.dissem.bitmessage.entity.NetworkMessage;
 import ch.dissem.bitmessage.entity.Version;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
+import ch.dissem.bitmessage.exception.NodeException;
 import ch.dissem.bitmessage.factory.V3MessageReader;
 import ch.dissem.bitmessage.networking.AbstractConnection;
 import ch.dissem.bitmessage.ports.NetworkHandler;
@@ -39,15 +41,15 @@ import static ch.dissem.bitmessage.ports.NetworkHandler.MAX_MESSAGE_SIZE;
  * Represents the current state of a connection.
  */
 public class ConnectionInfo extends AbstractConnection {
-    private ByteBuffer in = ByteBuffer.allocate(MAX_MESSAGE_SIZE);
     private ByteBuffer out = ByteBuffer.allocate(MAX_MESSAGE_SIZE);
     private V3MessageReader reader = new V3MessageReader();
     private boolean syncFinished;
+    private long lastUpdate = Long.MAX_VALUE;
 
     public ConnectionInfo(InternalContext context, Mode mode,
                           NetworkAddress node, NetworkHandler.MessageListener listener,
                           Set<InventoryVector> commonRequestedObjects, long syncTimeout) {
-        super(context, mode, node, listener, commonRequestedObjects, syncTimeout, false);
+        super(context, mode, node, listener, commonRequestedObjects, syncTimeout);
         out.flip();
         if (mode == CLIENT || mode == SYNC) {
             send(new Version.Builder().defaults(peerNonce).addrFrom(host).addrRecv(node).build());
@@ -67,7 +69,20 @@ public class ConnectionInfo extends AbstractConnection {
     }
 
     public ByteBuffer getInBuffer() {
-        return in;
+        if (reader == null) {
+            throw new NodeException("Node is disconnected");
+        }
+        return reader.getActiveBuffer();
+    }
+
+    public void updateWriter() {
+        if ((out == null || !out.hasRemaining()) && !sendingQueue.isEmpty()) {
+            out.clear();
+            MessagePayload payload = sendingQueue.poll();
+            new NetworkMessage(payload).write(out);
+            out.flip();
+            lastUpdate = System.currentTimeMillis();
+        }
     }
 
     public ByteBuffer getOutBuffer() {
@@ -75,7 +90,7 @@ public class ConnectionInfo extends AbstractConnection {
     }
 
     public void updateReader() {
-        reader.update(in);
+        reader.update();
         if (!reader.getMessages().isEmpty()) {
             Iterator<NetworkMessage> iterator = reader.getMessages().iterator();
             NetworkMessage msg = null;
@@ -86,6 +101,7 @@ public class ConnectionInfo extends AbstractConnection {
             }
             syncFinished = syncFinished(msg);
         }
+        lastUpdate = System.currentTimeMillis();
     }
 
     public void updateSyncStatus() {
@@ -94,6 +110,28 @@ public class ConnectionInfo extends AbstractConnection {
         }
     }
 
+    public boolean isExpired() {
+        switch (state) {
+            case CONNECTING:
+                return lastUpdate < System.currentTimeMillis() - 30000;
+            case ACTIVE:
+                return lastUpdate < System.currentTimeMillis() - 30000;
+            case DISCONNECTED:
+                return true;
+            default:
+                throw new IllegalStateException("Unknown state: " + state);
+        }
+    }
+
+    @Override
+    public synchronized void disconnect() {
+        super.disconnect();
+        if (reader != null) {
+            reader.cleanup();
+            reader = null;
+        }
+    }
+
     public boolean isSyncFinished() {
         return syncFinished;
     }
@@ -101,5 +139,9 @@ public class ConnectionInfo extends AbstractConnection {
     @Override
     protected void send(MessagePayload payload) {
         sendingQueue.add(payload);
+        if (payload instanceof GetData) {
+            requestedObjects.addAll(((GetData) payload).getInventory());
+            commonRequestedObjects.addAll(((GetData) payload).getInventory());
+        }
     }
 }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index c49d324..7ccea71 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -19,7 +19,6 @@ package ch.dissem.bitmessage.networking.nio;
 import ch.dissem.bitmessage.InternalContext;
 import ch.dissem.bitmessage.entity.CustomMessage;
 import ch.dissem.bitmessage.entity.GetData;
-import ch.dissem.bitmessage.entity.MessagePayload;
 import ch.dissem.bitmessage.entity.NetworkMessage;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
@@ -50,8 +49,7 @@ import static ch.dissem.bitmessage.utils.DebugUtils.inc;
 import static ch.dissem.bitmessage.utils.ThreadFactoryBuilder.pool;
 import static java.nio.channels.SelectionKey.OP_READ;
 import static java.nio.channels.SelectionKey.OP_WRITE;
-import static java.util.Collections.newSetFromMap;
-import static java.util.Collections.synchronizedSet;
+import static java.util.Collections.synchronizedMap;
 
 /**
  * Network handler using java.nio, resulting in less threads.
@@ -59,31 +57,33 @@ import static java.util.Collections.synchronizedSet;
 public class NioNetworkHandler implements NetworkHandler, InternalContext.ContextHolder {
     private static final Logger LOG = LoggerFactory.getLogger(NioNetworkHandler.class);
 
-    private final ExecutorService pool = Executors.newCachedThreadPool(
-            pool("network")
-                    .lowPrio()
-                    .daemon()
-                    .build());
+    private final ExecutorService threadPool = Executors.newCachedThreadPool(
+        pool("network")
+            .lowPrio()
+            .daemon()
+            .build());
 
     private InternalContext ctx;
     private Selector selector;
     private ServerSocketChannel serverChannel;
-    private Set<ConnectionInfo> connections = synchronizedSet(newSetFromMap(new WeakHashMap<ConnectionInfo, Boolean>()));
+    private Map<ConnectionInfo, SelectionKey> connections = synchronizedMap(new WeakHashMap<ConnectionInfo, SelectionKey>());
+    private int requestedObjectsCount;
+
+    private Thread starter;
 
     @Override
     public Future<Void> synchronize(final InetAddress server, final int port, final MessageListener listener, final long timeoutInSeconds) {
-        return pool.submit(new Callable<Void>() {
+        return threadPool.submit(new Callable<Void>() {
             @Override
             public Void call() throws Exception {
-                Set<InventoryVector> requestedObjects = new HashSet<>();
                 try (SocketChannel channel = SocketChannel.open(new InetSocketAddress(server, port))) {
                     channel.configureBlocking(false);
                     ConnectionInfo connection = new ConnectionInfo(ctx, SYNC,
-                            new NetworkAddress.Builder().ip(server).port(port).stream(1).build(),
-                            listener, new HashSet<InventoryVector>(), timeoutInSeconds);
-                    connections.add(connection);
+                        new NetworkAddress.Builder().ip(server).port(port).stream(1).build(),
+                        listener, new HashSet<InventoryVector>(), timeoutInSeconds);
+                    connections.put(connection, null);
                     while (channel.isConnected() && !connection.isSyncFinished()) {
-                        write(requestedObjects, channel, connection);
+                        write(channel, connection);
                         read(channel, connection);
                         Thread.sleep(10);
                     }
@@ -109,10 +109,8 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
 
             V3MessageReader reader = new V3MessageReader();
             while (channel.isConnected() && reader.getMessages().isEmpty()) {
-                if (channel.read(buffer) > 0) {
-                    buffer.flip();
-                    reader.update(buffer);
-                    buffer.compact();
+                if (channel.read(reader.getActiveBuffer()) > 0) {
+                    reader.update();
                 } else {
                     throw new NodeException("No response from node " + server);
                 }
@@ -131,7 +129,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                     throw new NodeException("Empty response from node " + server);
                 } else {
                     throw new NodeException("Unexpected response from node " + server + ": "
-                            + networkMessage.getPayload().getClass());
+                        + networkMessage.getPayload().getClass());
                 }
             }
         } catch (IOException e) {
@@ -164,12 +162,14 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                             SocketChannel accepted = serverChannel.accept();
                             accepted.configureBlocking(false);
                             ConnectionInfo connection = new ConnectionInfo(ctx, SERVER,
-                                    new NetworkAddress.Builder().address(accepted.getRemoteAddress()).stream(1).build(),
-                                    listener,
-                                    requestedObjects, 0
+                                new NetworkAddress.Builder().address(accepted.getRemoteAddress()).stream(1).build(),
+                                listener,
+                                requestedObjects, 0
+                            );
+                            connections.put(
+                                connection,
+                                accepted.register(selector, OP_READ | OP_WRITE, connection)
                             );
-                            accepted.register(selector, OP_READ | OP_WRITE, connection);
-                            connections.add(connection);
                         } catch (AsynchronousCloseException ignore) {
                             LOG.trace(ignore.getMessage());
                         } catch (IOException e) {
@@ -186,27 +186,53 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
             }
         });
 
-        thread("connection starter", new Runnable() {
+        starter = thread("connection starter", new Runnable() {
             @Override
             public void run() {
                 while (selector.isOpen()) {
-                    List<NetworkAddress> addresses = ctx.getNodeRegistry().getKnownAddresses(
-                            2, ctx.getStreams());
-                    for (NetworkAddress address : addresses) {
-                        try {
-                            SocketChannel channel = SocketChannel.open(
-                                    new InetSocketAddress(address.toInetAddress(), address.getPort()));
-                            channel.configureBlocking(false);
-                            ConnectionInfo connection = new ConnectionInfo(ctx, CLIENT,
+                    int missing = NETWORK_MAGIC_NUMBER;
+                    for (ConnectionInfo connectionInfo : connections.keySet()) {
+                        if (connectionInfo.getState() == ACTIVE) {
+                            missing--;
+                            if (missing == 0) break;
+                        }
+                    }
+                    if (missing > 0) {
+                        List<NetworkAddress> addresses = ctx.getNodeRegistry().getKnownAddresses(missing, ctx.getStreams());
+                        for (NetworkAddress address : addresses) {
+                            try {
+                                SocketChannel channel = SocketChannel.open();
+                                channel.configureBlocking(false);
+                                channel.connect(new InetSocketAddress(address.toInetAddress(), address.getPort()));
+                                channel.finishConnect();
+                                ConnectionInfo connection = new ConnectionInfo(ctx, CLIENT,
                                     address,
                                     listener,
                                     requestedObjects, 0
-                            );
-                            channel.register(selector, OP_READ | OP_WRITE, connection);
-                            connections.add(connection);
-                        } catch (AsynchronousCloseException ignore) {
-                        } catch (IOException e) {
-                            LOG.error(e.getMessage(), e);
+                                );
+                                connections.put(
+                                    connection,
+                                    channel.register(selector, OP_READ | OP_WRITE, connection)
+                                );
+                            } catch (AsynchronousCloseException ignore) {
+                            } catch (IOException e) {
+                                LOG.error(e.getMessage(), e);
+                            }
+                        }
+                    }
+
+                    Iterator<Map.Entry<ConnectionInfo, SelectionKey>> it = connections.entrySet().iterator();
+                    while (it.hasNext()) {
+                        Map.Entry<ConnectionInfo, SelectionKey> e = it.next();
+                        if (!e.getValue().isValid() || e.getKey().isExpired()) {
+                            try {
+                                e.getValue().channel().close();
+                            } catch (Exception ignore) {
+                            }
+                            e.getValue().cancel();
+                            e.getValue().attach(null);
+                            it.remove();
+                            e.getKey().disconnect();
                         }
                     }
                     try {
@@ -230,33 +256,37 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                             if (key.attachment() instanceof ConnectionInfo) {
                                 SocketChannel channel = (SocketChannel) key.channel();
                                 ConnectionInfo connection = (ConnectionInfo) key.attachment();
-                                if (key.isWritable()) {
-                                    write(requestedObjects, channel, connection);
-                                }
-                                if (key.isReadable()) {
-                                    read(channel, connection);
-                                }
-                                if (connection.getSendingQueue().isEmpty()) {
-                                    if (connection.getState() == DISCONNECTED) {
-                                        key.interestOps(0);
-                                        key.channel().close();
-                                    } else {
-                                        key.interestOps(OP_READ);
+                                try {
+                                    if (key.isWritable()) {
+                                        write(channel, connection);
                                     }
-                                } else {
-                                    key.interestOps(OP_READ | OP_WRITE);
+                                    if (key.isReadable()) {
+                                        read(channel, connection);
+                                    }
+                                    if (connection.getSendingQueue().isEmpty()) {
+                                        if (connection.getState() == DISCONNECTED) {
+                                            key.interestOps(0);
+                                            key.channel().close();
+                                        } else {
+                                            key.interestOps(OP_READ);
+                                        }
+                                    } else {
+                                        key.interestOps(OP_READ | OP_WRITE);
+                                    }
+                                } catch (NodeException | IOException e) {
+                                    connection.disconnect();
                                 }
                                 if (connection.getState() == DISCONNECTED) {
                                     connections.remove(connection);
                                 }
                             }
                             keyIterator.remove();
+                            requestedObjectsCount = requestedObjects.size();
                         }
-                        for (SelectionKey key : selector.keys()) {
-                            if ((key.interestOps() & OP_WRITE) == 0) {
-                                if (key.attachment() instanceof ConnectionInfo &&
-                                        !((ConnectionInfo) key.attachment()).getSendingQueue().isEmpty()) {
-                                    key.interestOps(OP_READ | OP_WRITE);
+                        for (Map.Entry<ConnectionInfo, SelectionKey> e : connections.entrySet()) {
+                            if (e.getValue().isValid() && (e.getValue().interestOps() & OP_WRITE) == 0) {
+                                if (!e.getKey().getSendingQueue().isEmpty()) {
+                                    e.getValue().interestOps(OP_READ | OP_WRITE);
                                 }
                             }
                         }
@@ -270,54 +300,44 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
         });
     }
 
-    private static void write(Set<InventoryVector> requestedObjects, SocketChannel channel, ConnectionInfo connection)
-            throws IOException {
-        if (!connection.getSendingQueue().isEmpty()) {
-            ByteBuffer buffer = connection.getOutBuffer();
-            if (buffer.hasRemaining()) {
-                channel.write(buffer);
-            }
-            while (!buffer.hasRemaining()
-                    && !connection.getSendingQueue().isEmpty()) {
-                buffer.clear();
-                MessagePayload payload = connection.getSendingQueue().poll();
-                if (payload instanceof GetData) {
-                    requestedObjects.addAll(((GetData) payload).getInventory());
-                }
-                new NetworkMessage(payload).write(buffer);
-                buffer.flip();
-                if (buffer.hasRemaining()) {
-                    channel.write(buffer);
-                }
-            }
+    private static void write(SocketChannel channel, ConnectionInfo connection)
+        throws IOException {
+        writeBuffer(connection.getOutBuffer(), channel);
+
+        connection.updateWriter();
+
+        writeBuffer(connection.getOutBuffer(), channel);
+    }
+
+    private static void writeBuffer(ByteBuffer buffer, SocketChannel channel) throws IOException {
+        if (buffer != null && buffer.hasRemaining()) {
+            channel.write(buffer);
         }
     }
 
     private static void read(SocketChannel channel, ConnectionInfo connection) throws IOException {
-        ByteBuffer buffer = connection.getInBuffer();
-        while (channel.read(buffer) > 0) {
-            buffer.flip();
+        while (channel.read(connection.getInBuffer()) > 0) {
             connection.updateReader();
-            buffer.compact();
         }
         connection.updateSyncStatus();
     }
 
-    private void thread(String threadName, Runnable runnable) {
+    private Thread thread(String threadName, Runnable runnable) {
         Thread thread = new Thread(runnable, threadName);
         thread.setDaemon(true);
         thread.setPriority(Thread.MIN_PRIORITY);
         thread.start();
+        return thread;
     }
 
     @Override
     public void stop() {
         try {
             serverChannel.socket().close();
-            for (SelectionKey selectionKey : selector.keys()) {
+            selector.close();
+            for (SelectionKey selectionKey : connections.values()) {
                 selectionKey.channel().close();
             }
-            selector.close();
         } catch (IOException e) {
             throw new ApplicationException(e);
         }
@@ -326,7 +346,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
     @Override
     public void offer(InventoryVector iv) {
         List<ConnectionInfo> target = new LinkedList<>();
-        for (ConnectionInfo connection : connections) {
+        for (ConnectionInfo connection : connections.keySet()) {
             if (connection.getState() == ACTIVE && !connection.knowsOf(iv)) {
                 target.add(connection);
             }
@@ -346,7 +366,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
         }
 
         Map<ConnectionInfo, List<InventoryVector>> distribution = new HashMap<>();
-        for (ConnectionInfo connection : connections) {
+        for (ConnectionInfo connection : connections.keySet()) {
             if (connection.getState() == ACTIVE) {
                 distribution.put(connection, new LinkedList<InventoryVector>());
             }
@@ -391,7 +411,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
         TreeMap<Long, Integer> incomingConnections = new TreeMap<>();
         TreeMap<Long, Integer> outgoingConnections = new TreeMap<>();
 
-        for (ConnectionInfo connection : connections) {
+        for (ConnectionInfo connection : connections.keySet()) {
             if (connection.getState() == ACTIVE) {
                 long stream = connection.getNode().getStream();
                 streams.add(stream);
@@ -408,22 +428,22 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
             int incoming = incomingConnections.containsKey(stream) ? incomingConnections.get(stream) : 0;
             int outgoing = outgoingConnections.containsKey(stream) ? outgoingConnections.get(stream) : 0;
             streamProperties[i] = new Property("stream " + stream,
-                    null, new Property("nodes", incoming + outgoing),
-                    new Property("incoming", incoming),
-                    new Property("outgoing", outgoing)
+                null, new Property("nodes", incoming + outgoing),
+                new Property("incoming", incoming),
+                new Property("outgoing", outgoing)
             );
             i++;
         }
         return new Property("network", null,
-                new Property("connectionManager", isRunning() ? "running" : "stopped"),
-                new Property("connections", null, streamProperties),
-                new Property("requestedObjects", "requestedObjects.size()") // TODO
+            new Property("connectionManager", isRunning() ? "running" : "stopped"),
+            new Property("connections", null, streamProperties),
+            new Property("requestedObjects", requestedObjectsCount)
         );
     }
 
     @Override
     public boolean isRunning() {
-        return selector != null && selector.isOpen();
+        return selector != null && selector.isOpen() && starter.isAlive();
     }
 
     @Override

From 56ebb7b8fad9810363abb7b52a759cd9181bb505 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 27 Jul 2016 07:38:39 +0200
Subject: [PATCH 64/87] Better memory management for the out buffer

---
 .../bitmessage/entity/NetworkMessage.java     | 28 +++++++++++++++++--
 .../networking/nio/ConnectionInfo.java        | 24 ++++++++++------
 .../networking/nio/NioNetworkHandler.java     | 24 ++++++++--------
 3 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java b/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
index e549101..f27384e 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/NetworkMessage.java
@@ -19,7 +19,6 @@ package ch.dissem.bitmessage.entity;
 import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.utils.Encode;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
@@ -93,8 +92,31 @@ public class NetworkMessage implements Streamable {
         out.write(payloadBytes);
     }
 
+    /**
+     * A more efficient implementation of the write method, writing header data to the provided buffer and returning
+     * a new buffer containing the payload.
+     *
+     * @param headerBuffer where the header data is written to (24 bytes)
+     * @return a buffer containing the payload, ready to be read.
+     */
+    public ByteBuffer writeHeaderAndGetPayloadBuffer(ByteBuffer headerBuffer) {
+        return ByteBuffer.wrap(writeHeader(headerBuffer));
+    }
+
+    /**
+     * For improved memory efficiency, you should use {@link #writeHeaderAndGetPayloadBuffer(ByteBuffer)}
+     * and write the header buffer as well as the returned payload buffer into the channel.
+     *
+     * @param buffer where everything gets written to. Needs to be large enough for the whole message
+     *               to be written.
+     */
     @Override
-    public void write(ByteBuffer out) {
+    public void write(ByteBuffer buffer) {
+        byte[] payloadBytes = writeHeader(buffer);
+        buffer.put(payloadBytes);
+    }
+
+    private byte[] writeHeader(ByteBuffer out) {
         // magic
         Encode.int32(MAGIC, out);
 
@@ -124,6 +146,6 @@ public class NetworkMessage implements Streamable {
         }
 
         // message payload
-        out.put(payloadBytes);
+        return payloadBytes;
     }
 }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
index ed0462d..647bc2c 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
@@ -35,13 +35,13 @@ import java.util.Set;
 
 import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.CLIENT;
 import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.SYNC;
-import static ch.dissem.bitmessage.ports.NetworkHandler.MAX_MESSAGE_SIZE;
 
 /**
  * Represents the current state of a connection.
  */
 public class ConnectionInfo extends AbstractConnection {
-    private ByteBuffer out = ByteBuffer.allocate(MAX_MESSAGE_SIZE);
+    private final ByteBuffer headerOut = ByteBuffer.allocate(24);
+    private ByteBuffer payloadOut;
     private V3MessageReader reader = new V3MessageReader();
     private boolean syncFinished;
     private long lastUpdate = Long.MAX_VALUE;
@@ -50,7 +50,7 @@ public class ConnectionInfo extends AbstractConnection {
                           NetworkAddress node, NetworkHandler.MessageListener listener,
                           Set<InventoryVector> commonRequestedObjects, long syncTimeout) {
         super(context, mode, node, listener, commonRequestedObjects, syncTimeout);
-        out.flip();
+        headerOut.flip();
         if (mode == CLIENT || mode == SYNC) {
             send(new Version.Builder().defaults(peerNonce).addrFrom(host).addrRecv(node).build());
         }
@@ -76,17 +76,23 @@ public class ConnectionInfo extends AbstractConnection {
     }
 
     public void updateWriter() {
-        if ((out == null || !out.hasRemaining()) && !sendingQueue.isEmpty()) {
-            out.clear();
+        if (!headerOut.hasRemaining() && !sendingQueue.isEmpty()) {
+            headerOut.clear();
             MessagePayload payload = sendingQueue.poll();
-            new NetworkMessage(payload).write(out);
-            out.flip();
+            payloadOut = new NetworkMessage(payload).writeHeaderAndGetPayloadBuffer(headerOut);
+            headerOut.flip();
             lastUpdate = System.currentTimeMillis();
         }
     }
 
-    public ByteBuffer getOutBuffer() {
-        return out;
+    public ByteBuffer[] getOutBuffers() {
+        return new ByteBuffer[]{headerOut, payloadOut};
+    }
+
+    public void cleanupBuffers() {
+        if (payloadOut != null && !payloadOut.hasRemaining()) {
+            payloadOut = null;
+        }
     }
 
     public void updateReader() {
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index 7ccea71..069662b 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -36,10 +36,7 @@ import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.nio.channels.*;
 import java.util.*;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
+import java.util.concurrent.*;
 
 import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.*;
 import static ch.dissem.bitmessage.networking.AbstractConnection.State.ACTIVE;
@@ -66,7 +63,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
     private InternalContext ctx;
     private Selector selector;
     private ServerSocketChannel serverChannel;
-    private Map<ConnectionInfo, SelectionKey> connections = synchronizedMap(new WeakHashMap<ConnectionInfo, SelectionKey>());
+    private Map<ConnectionInfo, SelectionKey> connections = new ConcurrentHashMap<>();
     private int requestedObjectsCount;
 
     private Thread starter;
@@ -81,13 +78,11 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                     ConnectionInfo connection = new ConnectionInfo(ctx, SYNC,
                         new NetworkAddress.Builder().ip(server).port(port).stream(1).build(),
                         listener, new HashSet<InventoryVector>(), timeoutInSeconds);
-                    connections.put(connection, null);
                     while (channel.isConnected() && !connection.isSyncFinished()) {
                         write(channel, connection);
                         read(channel, connection);
                         Thread.sleep(10);
                     }
-                    connections.remove(connection);
                     LOG.info("Synchronization finished");
                 }
                 return null;
@@ -302,16 +297,21 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
 
     private static void write(SocketChannel channel, ConnectionInfo connection)
         throws IOException {
-        writeBuffer(connection.getOutBuffer(), channel);
+        writeBuffer(connection.getOutBuffers(), channel);
 
         connection.updateWriter();
 
-        writeBuffer(connection.getOutBuffer(), channel);
+        writeBuffer(connection.getOutBuffers(), channel);
+        connection.cleanupBuffers();
     }
 
-    private static void writeBuffer(ByteBuffer buffer, SocketChannel channel) throws IOException {
-        if (buffer != null && buffer.hasRemaining()) {
-            channel.write(buffer);
+    private static void writeBuffer(ByteBuffer[] buffers, SocketChannel channel) throws IOException {
+        if (buffers[1] == null) {
+            if (buffers[0].hasRemaining()) {
+                channel.write(buffers[0]);
+            }
+        } else if (buffers[1].hasRemaining() || buffers[0].hasRemaining()) {
+            channel.write(buffers);
         }
     }
 

From 334a510743ceba8fd52e84c304a9810534b2dbaa Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 29 Jul 2016 07:49:53 +0200
Subject: [PATCH 65/87] Fixes, improved tests and other improvements

---
 .../entity/valueobject/NetworkAddress.java    |  8 +-
 .../dissem/bitmessage/factory/BufferPool.java | 88 ++++++++-----------
 .../bitmessage/factory/V3MessageFactory.java  | 34 ++++---
 .../bitmessage/factory/V3MessageReader.java   |  2 +-
 .../bitmessage/ports/NetworkHandler.java      |  3 +-
 .../networking/AbstractConnection.java        |  4 +
 .../networking/DefaultNetworkHandler.java     | 13 +--
 .../networking/nio/ConnectionInfo.java        |  2 +-
 .../networking/nio/NioNetworkHandler.java     | 19 ++--
 .../networking/NetworkHandlerTest.java        | 19 ++--
 10 files changed, 99 insertions(+), 93 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
index a496d19..94bc7c0 100644
--- a/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
+++ b/core/src/main/java/ch/dissem/bitmessage/entity/valueobject/NetworkAddress.java
@@ -41,19 +41,19 @@ public class NetworkAddress implements Streamable {
     /**
      * Stream number for this node
      */
-    private long stream;
+    private final long stream;
 
     /**
      * same service(s) listed in version
      */
-    private long services;
+    private final long services;
 
     /**
      * IPv6 address. IPv4 addresses are written into the message as a 16 byte IPv4-mapped IPv6 address
      * (12 bytes 00 00 00 00 00 00 00 00 00 00 FF FF, followed by the 4 bytes of the IPv4 address).
      */
-    private byte[] ipv6;
-    private int port;
+    private final byte[] ipv6;
+    private final int port;
 
     private NetworkAddress(Builder builder) {
         time = builder.time;
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/BufferPool.java b/core/src/main/java/ch/dissem/bitmessage/factory/BufferPool.java
index 15e5856..1b977d7 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/BufferPool.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/BufferPool.java
@@ -16,12 +16,16 @@
 
 package ch.dissem.bitmessage.factory;
 
-import ch.dissem.bitmessage.ports.NetworkHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.nio.ByteBuffer;
-import java.util.*;
+import java.util.Map;
+import java.util.Stack;
+import java.util.TreeMap;
+
+import static ch.dissem.bitmessage.ports.NetworkHandler.HEADER_SIZE;
+import static ch.dissem.bitmessage.ports.NetworkHandler.MAX_PAYLOAD_SIZE;
 
 /**
  * A pool for {@link ByteBuffer}s. As they may use up a lot of memory,
@@ -30,78 +34,58 @@ import java.util.*;
 class BufferPool {
     private static final Logger LOG = LoggerFactory.getLogger(BufferPool.class);
 
-    public static final BufferPool bufferPool = new BufferPool(256, 2048);
+    public static final BufferPool bufferPool = new BufferPool();
 
-    private final Map<Size, Integer> capacities = new EnumMap<>(Size.class);
-    private final Map<Size, Stack<ByteBuffer>> pools = new EnumMap<>(Size.class);
+    private final Map<Integer, Stack<ByteBuffer>> pools = new TreeMap<>();
 
-    private BufferPool(int small, int medium) {
-        capacities.put(Size.HEADER, 24);
-        capacities.put(Size.SMALL, small);
-        capacities.put(Size.MEDIUM, medium);
-        capacities.put(Size.LARGE, NetworkHandler.MAX_PAYLOAD_SIZE);
-        pools.put(Size.HEADER, new Stack<ByteBuffer>());
-        pools.put(Size.SMALL, new Stack<ByteBuffer>());
-        pools.put(Size.MEDIUM, new Stack<ByteBuffer>());
-        pools.put(Size.LARGE, new Stack<ByteBuffer>());
+    private BufferPool() {
+        pools.put(HEADER_SIZE, new Stack<ByteBuffer>());
+        pools.put(54, new Stack<ByteBuffer>());
+        pools.put(1000, new Stack<ByteBuffer>());
+        pools.put(60000, new Stack<ByteBuffer>());
+        pools.put(MAX_PAYLOAD_SIZE, new Stack<ByteBuffer>());
     }
 
     public synchronized ByteBuffer allocate(int capacity) {
-        Size targetSize = getTargetSize(capacity);
-        Size s = targetSize;
-        do {
-            Stack<ByteBuffer> pool = pools.get(s);
-            if (!pool.isEmpty()) {
-                return pool.pop();
+        for (Map.Entry<Integer, Stack<ByteBuffer>> e : pools.entrySet()) {
+            if (e.getKey() >= capacity && !e.getValue().isEmpty()) {
+                return e.getValue().pop();
             }
-            s = s.next();
-        } while (s != null);
+        }
+        Integer targetSize = getTargetSize(capacity);
         LOG.debug("Creating new buffer of size " + targetSize);
-        return ByteBuffer.allocate(capacities.get(targetSize));
+        return ByteBuffer.allocate(targetSize);
     }
 
-    public synchronized ByteBuffer allocate() {
-        Stack<ByteBuffer> pool = pools.get(Size.HEADER);
+    /**
+     * Returns a buffer that has the size of the Bitmessage network message header, 24 bytes.
+     *
+     * @return a buffer of size 24
+     */
+    public synchronized ByteBuffer allocateHeaderBuffer() {
+        Stack<ByteBuffer> pool = pools.get(HEADER_SIZE);
         if (!pool.isEmpty()) {
             return pool.pop();
         } else {
-            return ByteBuffer.allocate(capacities.get(Size.HEADER));
+            return ByteBuffer.allocate(HEADER_SIZE);
         }
     }
 
     public synchronized void deallocate(ByteBuffer buffer) {
         buffer.clear();
-        Size size = getTargetSize(buffer.capacity());
-        if (buffer.capacity() != capacities.get(size)) {
+
+        if (!pools.keySet().contains(buffer.capacity())) {
             throw new IllegalArgumentException("Illegal buffer capacity " + buffer.capacity() +
-                " one of " + capacities.values() + " expected.");
+                " one of " + pools.keySet() + " expected.");
         }
-        pools.get(size).push(buffer);
+        pools.get(buffer.capacity()).push(buffer);
     }
 
-    private Size getTargetSize(int capacity) {
-        for (Size s : Size.values()) {
-            if (capacity <= capacities.get(s)) {
-                return s;
-            }
+    private Integer getTargetSize(int capacity) {
+        for (Integer size : pools.keySet()) {
+            if (size >= capacity) return size;
         }
         throw new IllegalArgumentException("Requested capacity too large: " +
-            "requested=" + capacity + "; max=" + capacities.get(Size.LARGE));
-    }
-
-
-    private enum Size {
-        HEADER, SMALL, MEDIUM, LARGE;
-
-        public Size next() {
-            switch (this) {
-                case SMALL:
-                    return MEDIUM;
-                case MEDIUM:
-                    return LARGE;
-                default:
-                    return null;
-            }
-        }
+            "requested=" + capacity + "; max=" + MAX_PAYLOAD_SIZE);
     }
 }
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java
index 478d77c..7b27d13 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageFactory.java
@@ -107,12 +107,12 @@ class V3MessageFactory {
         }
 
         return new ObjectMessage.Builder()
-                .nonce(nonce)
-                .expiresTime(expiresTime)
-                .objectType(objectType)
-                .stream(stream)
-                .payload(payload)
-                .build();
+            .nonce(nonce)
+            .expiresTime(expiresTime)
+            .objectType(objectType)
+            .stream(stream)
+            .payload(payload)
+            .build();
     }
 
     private static GetData parseGetData(InputStream stream) throws IOException {
@@ -153,13 +153,13 @@ class V3MessageFactory {
         long[] streamNumbers = Decode.varIntList(stream);
 
         return new Version.Builder()
-                .version(version)
-                .services(services)
-                .timestamp(timestamp)
-                .addrRecv(addrRecv).addrFrom(addrFrom)
-                .nonce(nonce)
-                .userAgent(userAgent)
-                .streams(streamNumbers).build();
+            .version(version)
+            .services(services)
+            .timestamp(timestamp)
+            .addrRecv(addrRecv).addrFrom(addrFrom)
+            .nonce(nonce)
+            .userAgent(userAgent)
+            .streams(streamNumbers).build();
     }
 
     private static InventoryVector parseInventoryVector(InputStream stream) throws IOException {
@@ -179,7 +179,13 @@ class V3MessageFactory {
         long services = Decode.int64(stream);
         byte[] ipv6 = Decode.bytes(stream, 16);
         int port = Decode.uint16(stream);
-        return new NetworkAddress.Builder().time(time).stream(streamNumber).services(services).ipv6(ipv6).port(port).build();
+        return new NetworkAddress.Builder()
+            .time(time)
+            .stream(streamNumber)
+            .services(services)
+            .ipv6(ipv6)
+            .port(port)
+            .build();
     }
 
     private static boolean testChecksum(byte[] checksum, byte[] payload) {
diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
index bb4460f..d26cabe 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
@@ -58,7 +58,7 @@ public class V3MessageReader {
     public ByteBuffer getActiveBuffer() {
         if (state != null && state != ReaderState.DATA) {
             if (headerBuffer == null) {
-                headerBuffer = bufferPool.allocate();
+                headerBuffer = bufferPool.allocateHeaderBuffer();
             }
         }
         return state == ReaderState.DATA ? dataBuffer : headerBuffer;
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java b/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
index 96dec8e..9597625 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
@@ -31,8 +31,9 @@ import java.util.concurrent.Future;
  */
 public interface NetworkHandler {
     int NETWORK_MAGIC_NUMBER = 8;
+    int HEADER_SIZE = 24;
     int MAX_PAYLOAD_SIZE = 1600003;
-    int MAX_MESSAGE_SIZE = 24 + MAX_PAYLOAD_SIZE;
+    int MAX_MESSAGE_SIZE = HEADER_SIZE + MAX_PAYLOAD_SIZE;
 
     /**
      * Connects to the trusted host, fetches and offers new messages and disconnects afterwards.
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
index 73f26f5..411a57a 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
@@ -99,6 +99,10 @@ public abstract class AbstractConnection {
         return state;
     }
 
+    public long[] getStreams() {
+        return streams;
+    }
+
     protected void handleMessage(MessagePayload payload) {
         switch (state) {
             case ACTIVE:
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
index b5f93b1..f5bfd47 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
@@ -170,12 +170,13 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
 
         for (Connection connection : connections) {
             if (connection.getState() == ACTIVE) {
-                long stream = connection.getNode().getStream();
-                streams.add(stream);
-                if (connection.getMode() == SERVER) {
-                    inc(incomingConnections, stream);
-                } else {
-                    inc(outgoingConnections, stream);
+                for (long stream : connection.getStreams()) {
+                    streams.add(stream);
+                    if (connection.getMode() == SERVER) {
+                        inc(incomingConnections, stream);
+                    } else {
+                        inc(outgoingConnections, stream);
+                    }
                 }
             }
         }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
index 647bc2c..217743e 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
@@ -44,7 +44,7 @@ public class ConnectionInfo extends AbstractConnection {
     private ByteBuffer payloadOut;
     private V3MessageReader reader = new V3MessageReader();
     private boolean syncFinished;
-    private long lastUpdate = Long.MAX_VALUE;
+    private long lastUpdate = System.currentTimeMillis();
 
     public ConnectionInfo(InternalContext context, Mode mode,
                           NetworkAddress node, NetworkHandler.MessageListener listener,
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index 069662b..6c4ae10 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.NoRouteToHostException;
 import java.nio.ByteBuffer;
 import java.nio.channels.*;
 import java.util.*;
@@ -46,7 +47,6 @@ import static ch.dissem.bitmessage.utils.DebugUtils.inc;
 import static ch.dissem.bitmessage.utils.ThreadFactoryBuilder.pool;
 import static java.nio.channels.SelectionKey.OP_READ;
 import static java.nio.channels.SelectionKey.OP_WRITE;
-import static java.util.Collections.synchronizedMap;
 
 /**
  * Network handler using java.nio, resulting in less threads.
@@ -209,7 +209,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                                     connection,
                                     channel.register(selector, OP_READ | OP_WRITE, connection)
                                 );
-                            } catch (AsynchronousCloseException ignore) {
+                            } catch (NoRouteToHostException | AsynchronousCloseException ignore) {
                             } catch (IOException e) {
                                 LOG.error(e.getMessage(), e);
                             }
@@ -268,7 +268,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                                     } else {
                                         key.interestOps(OP_READ | OP_WRITE);
                                     }
-                                } catch (NodeException | IOException e) {
+                                } catch (CancelledKeyException | NodeException | IOException e) {
                                     connection.disconnect();
                                 }
                                 if (connection.getState() == DISCONNECTED) {
@@ -413,12 +413,13 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
 
         for (ConnectionInfo connection : connections.keySet()) {
             if (connection.getState() == ACTIVE) {
-                long stream = connection.getNode().getStream();
-                streams.add(stream);
-                if (connection.getMode() == SERVER) {
-                    inc(incomingConnections, stream);
-                } else {
-                    inc(outgoingConnections, stream);
+                for (long stream : connection.getStreams()) {
+                    streams.add(stream);
+                    if (connection.getMode() == SERVER) {
+                        inc(incomingConnections, stream);
+                    } else {
+                        inc(outgoingConnections, stream);
+                    }
                 }
             }
         }
diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index 475cbb1..e6aeb51 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -169,15 +169,24 @@ public class NetworkHandlerTest {
         } while (networkHandler.isRunning());
     }
 
-    @Test
-    public void ensureNodesAreConnecting() throws Exception {
-        node.startup();
+    private Property waitForNetworkStatus(BitmessageContext ctx) throws InterruptedException {
         Property status;
         do {
             Thread.sleep(100);
-            status = node.status().getProperty("network", "connections", "stream 0");
+            status = ctx.status().getProperty("network", "connections", "stream 1");
         } while (status == null);
-        assertEquals(1, status.getProperty("outgoing").getValue());
+        return status;
+    }
+
+    @Test
+    public void ensureNodesAreConnecting() throws Exception {
+        node.startup();
+
+        Property nodeStatus = waitForNetworkStatus(node);
+        Property peerStatus = waitForNetworkStatus(peer);
+
+        assertEquals(1, nodeStatus.getProperty("outgoing").getValue());
+        assertEquals(1, peerStatus.getProperty("incoming").getValue());
     }
 
     @Test

From 92229151a534938a7db347bc03775599098a9bce Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 29 Jul 2016 11:47:05 +0200
Subject: [PATCH 66/87] It seems travis is a bit slow sometimes, so I raised
 the timeout for the NetworkHandlerTest

---
 .../ch/dissem/bitmessage/networking/NetworkHandlerTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index e6aeb51..29fe020 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -66,7 +66,7 @@ public class NetworkHandlerTest {
     private final NetworkHandler nodeNetworkHandler;
 
     @Rule
-    public final TestRule timeout = new DisableOnDebug(Timeout.seconds(20));
+    public final TestRule timeout = new DisableOnDebug(Timeout.seconds(60));
 
     public NetworkHandlerTest(NetworkHandler peer, NetworkHandler node) {
         this.peerNetworkHandler = peer;

From 505818a712f52defbfc2ac7e1829ac0444720b91 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 8 Aug 2016 18:00:50 +0200
Subject: [PATCH 67/87] Added option to connect to local Bitmessage client
 (This makes it easier to debug some problem or make some tests)

---
 .../dissem/bitmessage/demo/Application.java   |  23 +---
 .../java/ch/dissem/bitmessage/demo/Main.java  |  57 +++++++--
 .../networking/NetworkHandlerTest.java        | 116 +++++++++---------
 3 files changed, 109 insertions(+), 87 deletions(-)

diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
index 4f155fa..3861831 100644
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/Application.java
@@ -17,14 +17,10 @@
 package ch.dissem.bitmessage.demo;
 
 import ch.dissem.bitmessage.BitmessageContext;
-import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.entity.BitmessageAddress;
 import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.entity.payload.Pubkey;
 import ch.dissem.bitmessage.entity.valueobject.Label;
-import ch.dissem.bitmessage.networking.nio.NioNetworkHandler;
-import ch.dissem.bitmessage.ports.MemoryNodeRegistry;
-import ch.dissem.bitmessage.repository.*;
 import org.apache.commons.lang3.text.WordUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,19 +41,10 @@ public class Application {
 
     private BitmessageContext ctx;
 
-    public Application(InetAddress syncServer, int syncPort) {
-        JdbcConfig jdbcConfig = new JdbcConfig();
-        ctx = new BitmessageContext.Builder()
-                .addressRepo(new JdbcAddressRepository(jdbcConfig))
-                .inventory(new JdbcInventory(jdbcConfig))
-                .nodeRegistry(new MemoryNodeRegistry())
-                .messageRepo(new JdbcMessageRepository(jdbcConfig))
-                .powRepo(new JdbcProofOfWorkRepository(jdbcConfig))
-                .networkHandler(new NioNetworkHandler())
-                .cryptography(new BouncyCryptography())
-                .port(48444)
-                .listener(plaintext -> System.out.println("New Message from " + plaintext.getFrom() + ": " + plaintext.getSubject()))
-                .build();
+    public Application(BitmessageContext.Builder ctxBuilder, InetAddress syncServer, int syncPort) {
+        ctx = ctxBuilder
+            .listener(plaintext -> System.out.println("New Message from " + plaintext.getFrom() + ": " + plaintext.getSubject()))
+            .build();
 
         if (syncServer == null) {
             ctx.startup();
@@ -392,7 +379,7 @@ public class Application {
         System.out.println(WordUtils.wrap(message.getText(), 120));
         System.out.println();
         System.out.println(message.getLabels().stream().map(Label::toString).collect(
-                Collectors.joining(", ", "Labels: ", "")));
+            Collectors.joining(", ", "Labels: ", "")));
         System.out.println();
         ctx.labeler().markAsRead(message);
         ctx.messages().save(message);
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
index 402fa91..84e8ce0 100644
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
@@ -18,20 +18,29 @@ package ch.dissem.bitmessage.demo;
 
 import ch.dissem.bitmessage.BitmessageContext;
 import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
+import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
 import ch.dissem.bitmessage.networking.nio.NioNetworkHandler;
 import ch.dissem.bitmessage.ports.MemoryNodeRegistry;
+import ch.dissem.bitmessage.ports.NodeRegistry;
 import ch.dissem.bitmessage.repository.*;
 import ch.dissem.bitmessage.wif.WifExporter;
 import ch.dissem.bitmessage.wif.WifImporter;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
 import org.kohsuke.args4j.Option;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.io.IOException;
 import java.net.InetAddress;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 public class Main {
+    private static final Logger LOG = LoggerFactory.getLogger(Main.class);
+
     public static void main(String[] args) throws IOException {
         if (System.getProperty("org.slf4j.simpleLogger.defaultLogLevel") == null)
             System.setProperty("org.slf4j.simpleLogger.defaultLogLevel", "ERROR");
@@ -45,18 +54,39 @@ public class Main {
         } catch (CmdLineException e) {
             parser.printUsage(System.err);
         }
+
+        JdbcConfig jdbcConfig = new JdbcConfig();
+        BitmessageContext.Builder ctxBuilder = new BitmessageContext.Builder()
+            .addressRepo(new JdbcAddressRepository(jdbcConfig))
+            .inventory(new JdbcInventory(jdbcConfig))
+            .messageRepo(new JdbcMessageRepository(jdbcConfig))
+            .powRepo(new JdbcProofOfWorkRepository(jdbcConfig))
+            .networkHandler(new NioNetworkHandler())
+            .cryptography(new BouncyCryptography())
+            .port(48444);
+        if (options.localPort != null) {
+            ctxBuilder.nodeRegistry(new NodeRegistry() {
+                @Override
+                public List<NetworkAddress> getKnownAddresses(int limit, long... streams) {
+                    return Arrays.stream(streams)
+                        .mapToObj(s -> new NetworkAddress.Builder()
+                            .ipv4(127, 0, 0, 1)
+                            .port(options.localPort)
+                            .stream(s).build())
+                        .collect(Collectors.toList());
+                }
+
+                @Override
+                public void offerAddresses(List<NetworkAddress> addresses) {
+                    LOG.info("Local node registry ignored offered addresses: " + addresses);
+                }
+            });
+        } else {
+            ctxBuilder.nodeRegistry(new MemoryNodeRegistry());
+        }
+
         if (options.exportWIF != null || options.importWIF != null) {
-            JdbcConfig jdbcConfig = new JdbcConfig();
-            BitmessageContext ctx = new BitmessageContext.Builder()
-                    .addressRepo(new JdbcAddressRepository(jdbcConfig))
-                    .inventory(new JdbcInventory(jdbcConfig))
-                    .nodeRegistry(new MemoryNodeRegistry())
-                    .messageRepo(new JdbcMessageRepository(jdbcConfig))
-                    .powRepo(new JdbcProofOfWorkRepository(jdbcConfig))
-                    .networkHandler(new NioNetworkHandler())
-                    .cryptography(new BouncyCryptography())
-                    .port(48444)
-                    .build();
+            BitmessageContext ctx = ctxBuilder.build();
 
             if (options.exportWIF != null) {
                 new WifExporter(ctx).addAll().write(options.exportWIF);
@@ -66,11 +96,14 @@ public class Main {
             }
         } else {
             InetAddress syncServer = options.syncServer == null ? null : InetAddress.getByName(options.syncServer);
-            new Application(syncServer, options.syncPort);
+            new Application(ctxBuilder, syncServer, options.syncPort);
         }
     }
 
     private static class CmdLineOptions {
+        @Option(name = "-local", usage = "Connect to local Bitmessage client on given port, instead of the usual connections from node.txt")
+        private Integer localPort;
+
         @Option(name = "-import", usage = "Import from keys.dat or other WIF file.")
         private File importWIF;
 
diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index 29fe020..ba24bbd 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -49,7 +49,9 @@ import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.mock;
 
 /**
- * FIXME: there really should be sensible tests for the network handler
+ * Tests network handlers. This test is parametrized, so it can test both the nio and classic implementation
+ * as well as their combinations. It might be slightly over the top and will most probably be cleaned up once
+ * the nio implementation is deemed stable.
  */
 @RunWith(Parameterized.class)
 public class NetworkHandlerTest {
@@ -76,10 +78,10 @@ public class NetworkHandlerTest {
     @Parameterized.Parameters
     public static List<Object[]> parameters() {
         return Arrays.asList(new Object[][]{
-                {new DefaultNetworkHandler(), new DefaultNetworkHandler()},
-                {new DefaultNetworkHandler(), new NioNetworkHandler()},
-                {new NioNetworkHandler(), new DefaultNetworkHandler()},
-                {new NioNetworkHandler(), new NioNetworkHandler()}
+            {new DefaultNetworkHandler(), new DefaultNetworkHandler()},
+            {new DefaultNetworkHandler(), new NioNetworkHandler()},
+            {new NioNetworkHandler(), new DefaultNetworkHandler()},
+            {new NioNetworkHandler(), new NioNetworkHandler()}
         });
     }
 
@@ -87,50 +89,50 @@ public class NetworkHandlerTest {
     public void setUp() {
         peerInventory = new TestInventory();
         peer = new BitmessageContext.Builder()
-                .addressRepo(mock(AddressRepository.class))
-                .inventory(peerInventory)
-                .messageRepo(mock(MessageRepository.class))
-                .powRepo(mock(ProofOfWorkRepository.class))
-                .port(peerAddress.getPort())
-                .nodeRegistry(new TestNodeRegistry())
-                .networkHandler(peerNetworkHandler)
-                .cryptography(new BouncyCryptography())
-                .listener(mock(BitmessageContext.Listener.class))
-                .customCommandHandler(new CustomCommandHandler() {
-                    @Override
-                    public MessagePayload handle(CustomMessage request) {
-                        byte[] data = request.getData();
-                        if (data.length > 0) {
-                            switch (data[0]) {
-                                case 0:
-                                    return null;
-                                case 1:
-                                    break;
-                                case 3:
-                                    data[0] = 0;
-                                    break;
-                                default:
-                                    break;
-                            }
+            .addressRepo(mock(AddressRepository.class))
+            .inventory(peerInventory)
+            .messageRepo(mock(MessageRepository.class))
+            .powRepo(mock(ProofOfWorkRepository.class))
+            .port(peerAddress.getPort())
+            .nodeRegistry(new TestNodeRegistry())
+            .networkHandler(peerNetworkHandler)
+            .cryptography(new BouncyCryptography())
+            .listener(mock(BitmessageContext.Listener.class))
+            .customCommandHandler(new CustomCommandHandler() {
+                @Override
+                public MessagePayload handle(CustomMessage request) {
+                    byte[] data = request.getData();
+                    if (data.length > 0) {
+                        switch (data[0]) {
+                            case 0:
+                                return null;
+                            case 1:
+                                break;
+                            case 3:
+                                data[0] = 0;
+                                break;
+                            default:
+                                break;
                         }
-                        return new CustomMessage("test response", request.getData());
                     }
-                })
-                .build();
+                    return new CustomMessage("test response", request.getData());
+                }
+            })
+            .build();
         peer.startup();
 
         nodeInventory = new TestInventory();
         node = new BitmessageContext.Builder()
-                .addressRepo(mock(AddressRepository.class))
-                .inventory(nodeInventory)
-                .messageRepo(mock(MessageRepository.class))
-                .powRepo(mock(ProofOfWorkRepository.class))
-                .port(6002)
-                .nodeRegistry(new TestNodeRegistry(peerAddress))
-                .networkHandler(nodeNetworkHandler)
-                .cryptography(new BouncyCryptography())
-                .listener(mock(BitmessageContext.Listener.class))
-                .build();
+            .addressRepo(mock(AddressRepository.class))
+            .inventory(nodeInventory)
+            .messageRepo(mock(MessageRepository.class))
+            .powRepo(mock(ProofOfWorkRepository.class))
+            .port(6002)
+            .nodeRegistry(new TestNodeRegistry(peerAddress))
+            .networkHandler(nodeNetworkHandler)
+            .cryptography(new BouncyCryptography())
+            .listener(mock(BitmessageContext.Listener.class))
+            .build();
     }
 
     @After
@@ -162,7 +164,7 @@ public class NetworkHandlerTest {
             } catch (InterruptedException ignore) {
                 if (networkHandler.isRunning()) {
                     LOG.warn("Thread interrupted while waiting for network shutdown - " +
-                            "this could cause problems in subsequent tests.");
+                        "this could cause problems in subsequent tests.");
                 }
                 return;
             }
@@ -219,18 +221,18 @@ public class NetworkHandlerTest {
     @Test
     public void ensureObjectsAreSynchronizedIfBothHaveObjects() throws Exception {
         peerInventory.init(
-                "V4Pubkey.payload",
-                "V5Broadcast.payload"
+            "V4Pubkey.payload",
+            "V5Broadcast.payload"
         );
 
         nodeInventory.init(
-                "V1Msg.payload",
-                "V4Pubkey.payload"
+            "V1Msg.payload",
+            "V4Pubkey.payload"
         );
 
         Future<?> future = nodeNetworkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
-                mock(NetworkHandler.MessageListener.class),
-                10);
+            mock(NetworkHandler.MessageListener.class),
+            10);
         future.get();
         assertInventorySize(3, nodeInventory);
         assertInventorySize(3, peerInventory);
@@ -239,15 +241,15 @@ public class NetworkHandlerTest {
     @Test
     public void ensureObjectsAreSynchronizedIfOnlyPeerHasObjects() throws Exception {
         peerInventory.init(
-                "V4Pubkey.payload",
-                "V5Broadcast.payload"
+            "V4Pubkey.payload",
+            "V5Broadcast.payload"
         );
 
         nodeInventory.init();
 
         Future<?> future = nodeNetworkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
-                mock(NetworkHandler.MessageListener.class),
-                10);
+            mock(NetworkHandler.MessageListener.class),
+            10);
         future.get();
         assertInventorySize(2, nodeInventory);
         assertInventorySize(2, peerInventory);
@@ -258,12 +260,12 @@ public class NetworkHandlerTest {
         peerInventory.init();
 
         nodeInventory.init(
-                "V1Msg.payload"
+            "V1Msg.payload"
         );
 
         Future<?> future = nodeNetworkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
-                mock(NetworkHandler.MessageListener.class),
-                10);
+            mock(NetworkHandler.MessageListener.class),
+            10);
         future.get();
         assertInventorySize(1, nodeInventory);
         assertInventorySize(1, peerInventory);

From cd3a801704c405eee6b6f4cc97dbc48ae14660b6 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Tue, 9 Aug 2016 19:50:11 +0200
Subject: [PATCH 68/87] Used wrong nonce for version message

---
 .../bitmessage/networking/AbstractConnection.java    | 12 ++++++------
 .../ch/dissem/bitmessage/networking/Connection.java  |  2 +-
 .../bitmessage/networking/nio/ConnectionInfo.java    |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
index 411a57a..f3900b1 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
@@ -146,7 +146,7 @@ public abstract class AbstractConnection {
         List<InventoryVector> missing = ctx.getInventory().getMissing(inv.getInventory(), streams);
         missing.removeAll(commonRequestedObjects);
         LOG.debug("Received inventory with " + originalSize + " elements, of which are "
-                + missing.size() + " missing.");
+            + missing.size() + " missing.");
         send(new GetData.Builder().inventory(missing).build());
     }
 
@@ -197,8 +197,8 @@ public abstract class AbstractConnection {
 
     public void offer(InventoryVector iv) {
         sendingQueue.offer(new Inv.Builder()
-                .addInventoryVector(iv)
-                .build());
+            .addInventoryVector(iv)
+            .build());
         updateIvCache(Collections.singletonList(iv));
     }
 
@@ -235,7 +235,7 @@ public abstract class AbstractConnection {
                 break;
             default:
                 throw new NodeException("Command 'version' or 'verack' expected, but was '"
-                        + payload.getCommand() + "'");
+                    + payload.getCommand() + "'");
         }
     }
 
@@ -259,8 +259,8 @@ public abstract class AbstractConnection {
         List<InventoryVector> inventory = ctx.getInventory().getInventory(streams);
         for (int i = 0; i < inventory.size(); i += 50000) {
             sendingQueue.offer(new Inv.Builder()
-                    .inventory(inventory.subList(i, Math.min(inventory.size(), i + 50000)))
-                    .build());
+                .inventory(inventory.subList(i, Math.min(inventory.size(), i + 50000)))
+                .build());
         }
     }
 
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
index bb5f370..e2c1856 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
@@ -162,7 +162,7 @@ class Connection extends AbstractConnection {
             try (Socket socket = Connection.this.socket) {
                 initSocket(socket);
                 if (mode == CLIENT || mode == SYNC) {
-                    send(new Version.Builder().defaults(peerNonce).addrFrom(host).addrRecv(node).build());
+                    send(new Version.Builder().defaults(ctx.getClientNonce()).addrFrom(host).addrRecv(node).build());
                 }
                 while (state != DISCONNECTED) {
                     if (mode != SYNC) {
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
index 217743e..e416da5 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
@@ -52,7 +52,7 @@ public class ConnectionInfo extends AbstractConnection {
         super(context, mode, node, listener, commonRequestedObjects, syncTimeout);
         headerOut.flip();
         if (mode == CLIENT || mode == SYNC) {
-            send(new Version.Builder().defaults(peerNonce).addrFrom(host).addrRecv(node).build());
+            send(new Version.Builder().defaults(ctx.getClientNonce()).addrFrom(host).addrRecv(node).build());
         }
     }
 

From 52422d3398e7797252a425faf8f95f0fb7d2b6cc Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 12 Aug 2016 11:04:04 +0200
Subject: [PATCH 69/87] Updated gradle

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 51017 -> 53637 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew                                  |  10 +++-------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3d0dee6e8edfecc92e04653ec780de06f7b34f8b..05ef575b0cd0173fc735f2857ce4bd594ce4f6bd 100644
GIT binary patch
delta 27739
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
R0PN7;b1VShefzJg{|Dq4H%b5i

delta 25341
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%0De-Tg^WWUi{Ab*i-+z%FjNMfgt;_TANT;bzcfd
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 94f382d..a657ea5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 16 20:59:34 CET 2015
+#Thu Aug 11 17:36:39 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
diff --git a/gradlew b/gradlew
index 91a7e26..9d82f78 100755
--- a/gradlew
+++ b/gradlew
@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

From 86cfc66a40083091ebbd0b3a721bc8ab92db1acd Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 12 Aug 2016 16:27:57 +0200
Subject: [PATCH 70/87] Automatically set version from git - Uses last tag on
 master branch (this is set on 'git flow release finish') - branch name
 snapshot otherwise, e.g. 'feature-nio-SNAPSHOT', 'develop-SNAPSHOT'

---
 build.gradle                                  |  6 +--
 .../ch/dissem/gradle/GitFlowVersion.groovy    | 53 +++++++++++++++++++
 .../gradle-plugins/gitflow-version.properties |  1 +
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 4 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy
 create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/gitflow-version.properties

diff --git a/build.gradle b/build.gradle
index 0e96284..311c3f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,12 +3,10 @@ subprojects {
     apply plugin: 'maven'
     apply plugin: 'signing'
     apply plugin: 'jacoco'
+    apply plugin: 'gitflow-version'
 
     sourceCompatibility = 1.7
     group = 'ch.dissem.jabit'
-    version = '1.1.0-SNAPSHOT'
-
-    ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
     repositories {
         mavenCentral()
@@ -35,7 +33,7 @@ subprojects {
     }
 
     signing {
-        required { isReleaseVersion && project.getProperties().get("signing.keyId")?.length() > 0 }
+        required { isRelease && project.getProperties().get("signing.keyId")?.length() > 0 }
         sign configurations.archives
     }
 
diff --git a/buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy b/buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy
new file mode 100644
index 0000000..81af76b
--- /dev/null
+++ b/buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy
@@ -0,0 +1,53 @@
+package ch.dissem.gradle
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+/**
+ * Sets the version as follows:
+ * <ul>
+ *     <li>If the branch is 'master', the version is set to the latest tag (which is expected to be set by Git flow)</li>
+ *     <li>Otherwise, the version is set to the branch name, with '-SNAPSHOT' appended</li>
+ * </ul>
+ */
+class GitFlowVersion implements Plugin<Project> {
+    def getBranch(Project project) {
+        def stdout = new ByteArrayOutputStream()
+        project.exec {
+            commandLine 'git', 'rev-parse', '--abbrev-ref', 'HEAD'
+            standardOutput = stdout
+        }
+        return stdout.toString().trim()
+    }
+
+    def getTag(Project project) {
+        def stdout = new ByteArrayOutputStream()
+        project.exec {
+            commandLine 'git', 'describe', '--abbrev=0'
+            standardOutput = stdout
+        }
+        return stdout.toString().trim()
+    }
+
+    def isRelease(Project project) {
+        return "master" == getBranch(project);
+    }
+
+    def getVersion(Project project) {
+        if (project.ext.isRelease) {
+            return getTag(project)
+        } else {
+            return getBranch(project).replaceAll("/", "-") + "-SNAPSHOT"
+        }
+    }
+
+    @Override
+    void apply(Project project) {
+        project.ext.isRelease = isRelease(project)
+        project.version = getVersion(project)
+
+        project.task('version') << {
+            println "Version deduced from git: '${project.version}'"
+        }
+    }
+}
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/gitflow-version.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/gitflow-version.properties
new file mode 100644
index 0000000..1fb4f78
--- /dev/null
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/gitflow-version.properties
@@ -0,0 +1 @@
+implementation-class=ch.dissem.gradle.GitFlowVersion
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a657ea5..ebcdff0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Aug 11 17:36:39 CEST 2016
+#Fri Aug 12 11:52:04 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

From 631e71bc7451f8dfdca5bc784af3d68a863b5f7c Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 12 Aug 2016 11:04:04 +0200
Subject: [PATCH 71/87] Updated gradle (cherry picked from commit 52422d3)

---
 gradle/wrapper/gradle-wrapper.jar        | Bin 51017 -> 53637 bytes
 gradle/wrapper/gradle-wrapper.properties |   4 ++--
 gradlew                                  |  10 +++-------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 3d0dee6e8edfecc92e04653ec780de06f7b34f8b..05ef575b0cd0173fc735f2857ce4bd594ce4f6bd 100644
GIT binary patch
delta 27739
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
R0PN7;b1VShefzJg{|Dq4H%b5i

delta 25341
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%0De-Tg^WWUi{Ab*i-+z%FjNMfgt;_TANT;bzcfd
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

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 94f382d..a657ea5 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Mar 16 20:59:34 CET 2015
+#Thu Aug 11 17:36:39 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
diff --git a/gradlew b/gradlew
index 91a7e26..9d82f78 100755
--- a/gradlew
+++ b/gradlew
@@ -42,11 +42,6 @@ case "`uname`" in
     ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -114,6 +109,7 @@ fi
 if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

From 41c444751420ee86f87c37b183a816bc3d107821 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Fri, 12 Aug 2016 22:02:06 +0200
Subject: [PATCH 72/87] Automatically set version from git - Uses last tag on
 master branch (this is set on 'git flow release finish') - branch name
 snapshot otherwise, e.g. 'feature-nio-SNAPSHOT', 'develop-SNAPSHOT'

(cherry picked from commit 86cfc66a40083091ebbd0b3a721bc8ab92db1acd)
---
 build.gradle                                  |  6 +--
 .../ch/dissem/gradle/GitFlowVersion.groovy    | 53 +++++++++++++++++++
 .../gradle-plugins/gitflow-version.properties |  1 +
 gradle/wrapper/gradle-wrapper.properties      |  4 +-
 4 files changed, 58 insertions(+), 6 deletions(-)
 create mode 100644 buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy
 create mode 100644 buildSrc/src/main/resources/META-INF/gradle-plugins/gitflow-version.properties

diff --git a/build.gradle b/build.gradle
index 0e96284..311c3f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,12 +3,10 @@ subprojects {
     apply plugin: 'maven'
     apply plugin: 'signing'
     apply plugin: 'jacoco'
+    apply plugin: 'gitflow-version'
 
     sourceCompatibility = 1.7
     group = 'ch.dissem.jabit'
-    version = '1.1.0-SNAPSHOT'
-
-    ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
     repositories {
         mavenCentral()
@@ -35,7 +33,7 @@ subprojects {
     }
 
     signing {
-        required { isReleaseVersion && project.getProperties().get("signing.keyId")?.length() > 0 }
+        required { isRelease && project.getProperties().get("signing.keyId")?.length() > 0 }
         sign configurations.archives
     }
 
diff --git a/buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy b/buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy
new file mode 100644
index 0000000..81af76b
--- /dev/null
+++ b/buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy
@@ -0,0 +1,53 @@
+package ch.dissem.gradle
+
+import org.gradle.api.Plugin
+import org.gradle.api.Project
+
+/**
+ * Sets the version as follows:
+ * <ul>
+ *     <li>If the branch is 'master', the version is set to the latest tag (which is expected to be set by Git flow)</li>
+ *     <li>Otherwise, the version is set to the branch name, with '-SNAPSHOT' appended</li>
+ * </ul>
+ */
+class GitFlowVersion implements Plugin<Project> {
+    def getBranch(Project project) {
+        def stdout = new ByteArrayOutputStream()
+        project.exec {
+            commandLine 'git', 'rev-parse', '--abbrev-ref', 'HEAD'
+            standardOutput = stdout
+        }
+        return stdout.toString().trim()
+    }
+
+    def getTag(Project project) {
+        def stdout = new ByteArrayOutputStream()
+        project.exec {
+            commandLine 'git', 'describe', '--abbrev=0'
+            standardOutput = stdout
+        }
+        return stdout.toString().trim()
+    }
+
+    def isRelease(Project project) {
+        return "master" == getBranch(project);
+    }
+
+    def getVersion(Project project) {
+        if (project.ext.isRelease) {
+            return getTag(project)
+        } else {
+            return getBranch(project).replaceAll("/", "-") + "-SNAPSHOT"
+        }
+    }
+
+    @Override
+    void apply(Project project) {
+        project.ext.isRelease = isRelease(project)
+        project.version = getVersion(project)
+
+        project.task('version') << {
+            println "Version deduced from git: '${project.version}'"
+        }
+    }
+}
diff --git a/buildSrc/src/main/resources/META-INF/gradle-plugins/gitflow-version.properties b/buildSrc/src/main/resources/META-INF/gradle-plugins/gitflow-version.properties
new file mode 100644
index 0000000..1fb4f78
--- /dev/null
+++ b/buildSrc/src/main/resources/META-INF/gradle-plugins/gitflow-version.properties
@@ -0,0 +1 @@
+implementation-class=ch.dissem.gradle.GitFlowVersion
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a657ea5..ebcdff0 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Aug 11 17:36:39 CEST 2016
+#Fri Aug 12 11:52:04 CEST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip

From 1eac64481376fd8ccc21d6160845ad7df0707ccd Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 15 Aug 2016 11:52:43 +0200
Subject: [PATCH 73/87] Fixed error in AbstractMessageRepository (archived
 messages couldn't be found)

---
 .../dissem/bitmessage/ports/AbstractMessageRepository.java  | 6 +++++-
 .../bitmessage/repository/JdbcProofOfWorkRepository.java    | 3 ---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/AbstractMessageRepository.java b/core/src/main/java/ch/dissem/bitmessage/ports/AbstractMessageRepository.java
index e037c4f..e0448c7 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/AbstractMessageRepository.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/AbstractMessageRepository.java
@@ -70,7 +70,11 @@ public abstract class AbstractMessageRepository implements MessageRepository, In
 
     @Override
     public List<Plaintext> findMessages(Label label) {
-        return find("id IN (SELECT message_id FROM Message_Label WHERE label_id=" + label.getId() + ")");
+        if (label == null) {
+            return find("id NOT IN (SELECT message_id FROM Message_Label)");
+        } else {
+            return find("id IN (SELECT message_id FROM Message_Label WHERE label_id=" + label.getId() + ")");
+        }
     }
 
     @Override
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java
index ac6e69f..0fda3fa 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcProofOfWorkRepository.java
@@ -2,7 +2,6 @@ package ch.dissem.bitmessage.repository;
 
 import ch.dissem.bitmessage.InternalContext;
 import ch.dissem.bitmessage.entity.ObjectMessage;
-import ch.dissem.bitmessage.entity.Plaintext;
 import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.factory.Factory;
 import ch.dissem.bitmessage.ports.ProofOfWorkRepository;
@@ -10,9 +9,7 @@ import ch.dissem.bitmessage.utils.Strings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.sql.*;
 import java.util.LinkedList;
 import java.util.List;

From caa2219a6301056600f9c89ae82d0572760d5c5e Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 24 Aug 2016 22:17:02 +0200
Subject: [PATCH 74/87] It looks like the NIO network handler works now - some
 testing needed to see how reliably

---
 .../bitmessage/factory/V3MessageReader.java   | 41 ------------
 core/src/main/resources/nodes.txt             |  2 +-
 .../networking/AbstractConnection.java        |  5 +-
 .../networking/nio/ConnectionInfo.java        | 19 +++---
 .../networking/nio/NioNetworkHandler.java     | 62 ++++++++++++-------
 repositories/build.gradle                     |  4 +-
 6 files changed, 59 insertions(+), 74 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
index d26cabe..89677cd 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/V3MessageReader.java
@@ -21,17 +21,13 @@ import ch.dissem.bitmessage.entity.NetworkMessage;
 import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.NodeException;
 import ch.dissem.bitmessage.utils.Decode;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.io.ByteArrayInputStream;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.UUID;
 
 import static ch.dissem.bitmessage.entity.NetworkMessage.MAGIC_BYTES;
 import static ch.dissem.bitmessage.factory.BufferPool.bufferPool;
@@ -42,8 +38,6 @@ import static ch.dissem.bitmessage.utils.Singleton.cryptography;
  * Similar to the {@link V3MessageFactory}, but used for NIO buffers which may or may not contain a whole message.
  */
 public class V3MessageReader {
-    private static final Logger LOG = LoggerFactory.getLogger(V3MessageReader.class);
-
     private ByteBuffer headerBuffer;
     private ByteBuffer dataBuffer;
 
@@ -53,7 +47,6 @@ public class V3MessageReader {
     private byte[] checksum;
 
     private List<NetworkMessage> messages = new LinkedList<>();
-    private SizeInfo sizeInfo = new SizeInfo();
 
     public ByteBuffer getActiveBuffer() {
         if (state != null && state != ReaderState.DATA) {
@@ -88,7 +81,6 @@ public class V3MessageReader {
                     throw new NodeException("Payload of " + length + " bytes received, no more than " +
                         MAX_PAYLOAD_SIZE + " was expected.");
                 }
-                sizeInfo.add(length); // FIXME: remove this once we have some values to work with
                 checksum = new byte[4];
                 headerBuffer.get(checksum);
                 state = ReaderState.DATA;
@@ -194,37 +186,4 @@ public class V3MessageReader {
     }
 
     private enum ReaderState {MAGIC, HEADER, DATA}
-
-    private class SizeInfo {
-        private FileWriter file;
-        private long min = Long.MAX_VALUE;
-        private long avg = 0;
-        private long max = Long.MIN_VALUE;
-        private long count = 0;
-
-        private SizeInfo() {
-            try {
-                file = new FileWriter("D:/message_size_info-" + UUID.randomUUID() + ".csv");
-            } catch (IOException e) {
-                LOG.error(e.getMessage(), e);
-            }
-        }
-
-        private void add(long length) {
-            avg = (count * avg + length) / (count + 1);
-            if (length < min) {
-                min = length;
-            }
-            if (length > max) {
-                max = length;
-            }
-            count++;
-            LOG.info("Received message with data size " + length + "; Min: " + min + "; Max: " + max + "; Avg: " + avg);
-            try {
-                file.write(length + "\n");
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
 }
diff --git a/core/src/main/resources/nodes.txt b/core/src/main/resources/nodes.txt
index 9466a85..bce982e 100644
--- a/core/src/main/resources/nodes.txt
+++ b/core/src/main/resources/nodes.txt
@@ -5,4 +5,4 @@ bootstrap8080.bitmessage.org:8080
 bootstrap8444.bitmessage.org:8444
 
 [stream 2]
-# none yet
\ No newline at end of file
+# none yet
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
index f3900b1..66f7dca 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
@@ -228,10 +228,11 @@ public abstract class AbstractConnection {
                 break;
             case CUSTOM:
                 MessagePayload response = ctx.getCustomCommandHandler().handle((CustomMessage) payload);
-                if (response != null) {
+                if (response == null) {
+                    disconnect();
+                } else {
                     send(response);
                 }
-                disconnect();
                 break;
             default:
                 throw new NodeException("Command 'version' or 'verack' expected, but was '"
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
index e416da5..fb4cf58 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
@@ -17,10 +17,7 @@
 package ch.dissem.bitmessage.networking.nio;
 
 import ch.dissem.bitmessage.InternalContext;
-import ch.dissem.bitmessage.entity.GetData;
-import ch.dissem.bitmessage.entity.MessagePayload;
-import ch.dissem.bitmessage.entity.NetworkMessage;
-import ch.dissem.bitmessage.entity.Version;
+import ch.dissem.bitmessage.entity.*;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
 import ch.dissem.bitmessage.exception.NodeException;
@@ -112,16 +109,18 @@ public class ConnectionInfo extends AbstractConnection {
 
     public void updateSyncStatus() {
         if (!syncFinished) {
-            syncFinished = reader.getMessages().isEmpty() && syncFinished(null);
+            syncFinished = (reader == null || reader.getMessages().isEmpty()) && syncFinished(null);
         }
     }
 
     public boolean isExpired() {
         switch (state) {
             case CONNECTING:
-                return lastUpdate < System.currentTimeMillis() - 30000;
+                // the TCP timeout starts out at 20 seconds
+                return lastUpdate < System.currentTimeMillis() - 20_000;
             case ACTIVE:
-                return lastUpdate < System.currentTimeMillis() - 30000;
+                // after verack messages are exchanged, the timeout is raised to 10 minutes
+                return lastUpdate < System.currentTimeMillis() - 600_000;
             case DISCONNECTED:
                 return true;
             default:
@@ -150,4 +149,10 @@ public class ConnectionInfo extends AbstractConnection {
             commonRequestedObjects.addAll(((GetData) payload).getInventory());
         }
     }
+
+    public boolean isWritePending() {
+        return !sendingQueue.isEmpty()
+            || headerOut != null && headerOut.hasRemaining()
+            || payloadOut != null && payloadOut.hasRemaining();
+    }
 }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index 6c4ae10..b1d1cb6 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -64,7 +64,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
     private Selector selector;
     private ServerSocketChannel serverChannel;
     private Map<ConnectionInfo, SelectionKey> connections = new ConcurrentHashMap<>();
-    private int requestedObjectsCount;
+    private volatile int requestedObjectsCount;
 
     private Thread starter;
 
@@ -94,13 +94,15 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
     public CustomMessage send(InetAddress server, int port, CustomMessage request) {
         try (SocketChannel channel = SocketChannel.open(new InetSocketAddress(server, port))) {
             channel.configureBlocking(true);
-            ByteBuffer buffer = ByteBuffer.allocate(MAX_MESSAGE_SIZE);
-            new NetworkMessage(request).write(buffer);
-            buffer.flip();
-            while (buffer.hasRemaining()) {
-                channel.write(buffer);
+            ByteBuffer headerBuffer = ByteBuffer.allocate(HEADER_SIZE);
+            ByteBuffer payloadBuffer = new NetworkMessage(request).writeHeaderAndGetPayloadBuffer(headerBuffer);
+            headerBuffer.flip();
+            while (headerBuffer.hasRemaining()) {
+                channel.write(headerBuffer);
+            }
+            while (payloadBuffer.hasRemaining()) {
+                channel.write(payloadBuffer);
             }
-            buffer.clear();
 
             V3MessageReader reader = new V3MessageReader();
             while (channel.isConnected() && reader.getMessages().isEmpty()) {
@@ -195,11 +197,25 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                     if (missing > 0) {
                         List<NetworkAddress> addresses = ctx.getNodeRegistry().getKnownAddresses(missing, ctx.getStreams());
                         for (NetworkAddress address : addresses) {
+                            if (isConnectedTo(address)) {
+                                continue;
+                            }
                             try {
                                 SocketChannel channel = SocketChannel.open();
                                 channel.configureBlocking(false);
                                 channel.connect(new InetSocketAddress(address.toInetAddress(), address.getPort()));
-                                channel.finishConnect();
+                                long timeout = System.currentTimeMillis() + 20_000;
+                                while (!channel.finishConnect() && System.currentTimeMillis() < timeout) {
+                                    try {
+                                        Thread.sleep(100);
+                                    } catch (InterruptedException e) {
+                                        break;
+                                    }
+                                }
+                                if (!channel.finishConnect()) {
+                                    channel.close();
+                                    continue;
+                                }
                                 ConnectionInfo connection = new ConnectionInfo(ctx, CLIENT,
                                     address,
                                     listener,
@@ -248,6 +264,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                         Iterator<SelectionKey> keyIterator = selector.selectedKeys().iterator();
                         while (keyIterator.hasNext()) {
                             SelectionKey key = keyIterator.next();
+                            keyIterator.remove();
                             if (key.attachment() instanceof ConnectionInfo) {
                                 SocketChannel channel = (SocketChannel) key.channel();
                                 ConnectionInfo connection = (ConnectionInfo) key.attachment();
@@ -258,24 +275,18 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                                     if (key.isReadable()) {
                                         read(channel, connection);
                                     }
-                                    if (connection.getSendingQueue().isEmpty()) {
-                                        if (connection.getState() == DISCONNECTED) {
-                                            key.interestOps(0);
-                                            key.channel().close();
-                                        } else {
-                                            key.interestOps(OP_READ);
-                                        }
-                                    } else {
+                                    if (connection.getState() == DISCONNECTED) {
+                                        key.interestOps(0);
+                                        channel.close();
+                                    } else if (connection.isWritePending()) {
                                         key.interestOps(OP_READ | OP_WRITE);
+                                    } else {
+                                        key.interestOps(OP_READ);
                                     }
                                 } catch (CancelledKeyException | NodeException | IOException e) {
                                     connection.disconnect();
                                 }
-                                if (connection.getState() == DISCONNECTED) {
-                                    connections.remove(connection);
-                                }
                             }
-                            keyIterator.remove();
                             requestedObjectsCount = requestedObjects.size();
                         }
                         for (Map.Entry<ConnectionInfo, SelectionKey> e : connections.entrySet()) {
@@ -316,7 +327,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
     }
 
     private static void read(SocketChannel channel, ConnectionInfo connection) throws IOException {
-        while (channel.read(connection.getInBuffer()) > 0) {
+        if (channel.read(connection.getInBuffer()) > 0) {
             connection.updateReader();
         }
         connection.updateSyncStatus();
@@ -442,6 +453,15 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
         );
     }
 
+    private boolean isConnectedTo(NetworkAddress address) {
+        for (ConnectionInfo c : connections.keySet()) {
+            if (c.getNode().equals(address)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     public boolean isRunning() {
         return selector != null && selector.isOpen() && starter.isAlive();
diff --git a/repositories/build.gradle b/repositories/build.gradle
index 2ab092c..032ffbc 100644
--- a/repositories/build.gradle
+++ b/repositories/build.gradle
@@ -14,10 +14,10 @@ sourceCompatibility = 1.8
 
 dependencies {
     compile project(':core')
-    compile 'org.flywaydb:flyway-core:3.2.1'
+    compile 'org.flywaydb:flyway-core:4.0.3'
     testCompile 'junit:junit:4.12'
     testCompile 'com.h2database:h2:1.4.190'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile project(path: ':core', configuration: 'testArtifacts')
     testCompile project(':cryptography-bc')
-}
\ No newline at end of file
+}

From 102d63e2c64d0902bb3895efe822d477be4417bd Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Thu, 25 Aug 2016 08:50:06 +0200
Subject: [PATCH 75/87] Fixed message count per label

---
 demo/build.gradle                                              | 2 +-
 repositories/build.gradle                                      | 2 +-
 .../ch/dissem/bitmessage/repository/JdbcMessageRepository.java | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/demo/build.gradle b/demo/build.gradle
index 0cf1781..79f5834 100644
--- a/demo/build.gradle
+++ b/demo/build.gradle
@@ -30,7 +30,7 @@ dependencies {
     compile project(':wif')
     compile 'org.slf4j:slf4j-simple:1.7.12'
     compile 'args4j:args4j:2.32'
-    compile 'com.h2database:h2:1.4.190'
+    compile 'com.h2database:h2:1.4.192'
     compile 'org.apache.commons:commons-lang3:3.4'
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:1.10.19'
diff --git a/repositories/build.gradle b/repositories/build.gradle
index 032ffbc..3f5874b 100644
--- a/repositories/build.gradle
+++ b/repositories/build.gradle
@@ -16,7 +16,7 @@ dependencies {
     compile project(':core')
     compile 'org.flywaydb:flyway-core:4.0.3'
     testCompile 'junit:junit:4.12'
-    testCompile 'com.h2database:h2:1.4.190'
+    testCompile 'com.h2database:h2:1.4.192'
     testCompile 'org.mockito:mockito-core:1.10.19'
     testCompile project(path: ':core', configuration: 'testArtifacts')
     testCompile project(':cryptography-bc')
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
index e2e247a..3788d96 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcMessageRepository.java
@@ -81,8 +81,7 @@ public class JdbcMessageRepository extends AbstractMessageRepository implements
         try (
                 Connection connection = config.getConnection();
                 Statement stmt = connection.createStatement();
-                ResultSet rs = stmt.executeQuery("SELECT count(*) FROM Message WHERE " + where
-                        + " ORDER BY received DESC")
+                ResultSet rs = stmt.executeQuery("SELECT count(*) FROM Message WHERE " + where)
         ) {
             if (rs.next()) {
                 return rs.getInt(1);

From 53aa2c6804977bac68da8d4e2bbd3d241a488d2c Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Thu, 25 Aug 2016 12:44:06 +0200
Subject: [PATCH 76/87] Slightly improved the problem with stale objects in the
 requested objects list. But I don't know how to properly solve it, there may
 always be some left.

---
 .../bitmessage/networking/AbstractConnection.java  |  2 +-
 .../networking/nio/NioNetworkHandler.java          | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
index 66f7dca..4a209aa 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
@@ -183,7 +183,7 @@ public abstract class AbstractConnection {
     }
 
     private void receiveMessage(Addr addr) {
-        LOG.debug("Received " + addr.getAddresses().size() + " addresses.");
+        LOG.trace("Received " + addr.getAddresses().size() + " addresses.");
         ctx.getNodeRegistry().offerAddresses(addr.getAddresses());
     }
 
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index b1d1cb6..7c6a5b6 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -64,7 +64,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
     private Selector selector;
     private ServerSocketChannel serverChannel;
     private Map<ConnectionInfo, SelectionKey> connections = new ConcurrentHashMap<>();
-    private volatile int requestedObjectsCount;
+    private final Set<InventoryVector> requestedObjects = Collections.newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(10_000));
 
     private Thread starter;
 
@@ -147,7 +147,6 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
         } catch (IOException e) {
             throw new ApplicationException(e);
         }
-        final Set<InventoryVector> requestedObjects = new HashSet<>();
         thread("connection listener", new Runnable() {
             @Override
             public void run() {
@@ -287,7 +286,6 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                                     connection.disconnect();
                                 }
                             }
-                            requestedObjectsCount = requestedObjects.size();
                         }
                         for (Map.Entry<ConnectionInfo, SelectionKey> e : connections.entrySet()) {
                             if (e.getValue().isValid() && (e.getValue().interestOps() & OP_WRITE) == 0) {
@@ -370,7 +368,10 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
 
     @Override
     public void request(Collection<InventoryVector> inventoryVectors) {
-        if (!isRunning()) return;
+        if (!isRunning()) {
+            requestedObjects.clear();
+            return;
+        }
         Iterator<InventoryVector> iterator = inventoryVectors.iterator();
         if (!iterator.hasNext()) {
             return;
@@ -408,6 +409,9 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
             }
         } while (iterator.hasNext());
 
+        // remove objects nobody knows of
+        requestedObjects.removeAll(inventoryVectors);
+
         for (ConnectionInfo connection : distribution.keySet()) {
             List<InventoryVector> ivs = distribution.get(connection);
             if (!ivs.isEmpty()) {
@@ -449,7 +453,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
         return new Property("network", null,
             new Property("connectionManager", isRunning() ? "running" : "stopped"),
             new Property("connections", null, streamProperties),
-            new Property("requestedObjects", requestedObjectsCount)
+            new Property("requestedObjects", requestedObjects.size())
         );
     }
 

From 827973f64278231e5c03b64d74cb779c5e6dfdb8 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 29 Aug 2016 12:30:26 +0200
Subject: [PATCH 77/87] Improved connecting to the network

---
 .../networking/nio/NioNetworkHandler.java     | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index 7c6a5b6..7f04aa1 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -45,8 +45,7 @@ import static ch.dissem.bitmessage.networking.AbstractConnection.State.DISCONNEC
 import static ch.dissem.bitmessage.utils.Collections.selectRandom;
 import static ch.dissem.bitmessage.utils.DebugUtils.inc;
 import static ch.dissem.bitmessage.utils.ThreadFactoryBuilder.pool;
-import static java.nio.channels.SelectionKey.OP_READ;
-import static java.nio.channels.SelectionKey.OP_WRITE;
+import static java.nio.channels.SelectionKey.*;
 
 /**
  * Network handler using java.nio, resulting in less threads.
@@ -203,18 +202,6 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                                 SocketChannel channel = SocketChannel.open();
                                 channel.configureBlocking(false);
                                 channel.connect(new InetSocketAddress(address.toInetAddress(), address.getPort()));
-                                long timeout = System.currentTimeMillis() + 20_000;
-                                while (!channel.finishConnect() && System.currentTimeMillis() < timeout) {
-                                    try {
-                                        Thread.sleep(100);
-                                    } catch (InterruptedException e) {
-                                        break;
-                                    }
-                                }
-                                if (!channel.finishConnect()) {
-                                    channel.close();
-                                    continue;
-                                }
                                 ConnectionInfo connection = new ConnectionInfo(ctx, CLIENT,
                                     address,
                                     listener,
@@ -222,9 +209,18 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                                 );
                                 connections.put(
                                     connection,
-                                    channel.register(selector, OP_READ | OP_WRITE, connection)
+                                    channel.register(selector, OP_CONNECT, connection)
                                 );
-                            } catch (NoRouteToHostException | AsynchronousCloseException ignore) {
+                            } catch (NoRouteToHostException ignore) {
+                                // We'll try to connect to many offline nodes, so
+                                // this is expected to happen quite a lot.
+                            } catch (AsynchronousCloseException e) {
+                                // The exception is expected if the network is being
+                                // shut down, as we actually do asynchronously close
+                                // the connections.
+                                if (isRunning()) {
+                                    LOG.error(e.getMessage(), e);
+                                }
                             } catch (IOException e) {
                                 LOG.error(e.getMessage(), e);
                             }
@@ -268,6 +264,11 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                                 SocketChannel channel = (SocketChannel) key.channel();
                                 ConnectionInfo connection = (ConnectionInfo) key.attachment();
                                 try {
+                                    if (key.isConnectable()) {
+                                        if (!channel.finishConnect()) {
+                                            continue;
+                                        }
+                                    }
                                     if (key.isWritable()) {
                                         write(channel, connection);
                                     }
@@ -288,10 +289,11 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                             }
                         }
                         for (Map.Entry<ConnectionInfo, SelectionKey> e : connections.entrySet()) {
-                            if (e.getValue().isValid() && (e.getValue().interestOps() & OP_WRITE) == 0) {
-                                if (!e.getKey().getSendingQueue().isEmpty()) {
-                                    e.getValue().interestOps(OP_READ | OP_WRITE);
-                                }
+                            if (e.getValue().isValid()
+                                && (e.getValue().interestOps() & OP_WRITE) == 0
+                                && (e.getValue().interestOps() & OP_CONNECT) == 0
+                                && !e.getKey().getSendingQueue().isEmpty()) {
+                                e.getValue().interestOps(OP_READ | OP_WRITE);
                             }
                         }
                     }

From dad05d835b8cab9fdbebb60c58c546df809f7d8b Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Thu, 1 Sep 2016 07:35:46 +0200
Subject: [PATCH 78/87] Created an improved JdbcNodeRegistry and removed
 MemoryNodeRegistry, as it doesn't properly work with the way nodes are
 handled and disseminated in the new PyBitmessage client. The new one should
 work a lot more stable.

---
 .../bitmessage/ports/MemoryNodeRegistry.java  | 125 -------------
 .../bitmessage/ports/NodeRegistryHelper.java  |  54 ++++++
 .../bitmessage/ports/NodeRegistryTest.java    |  99 -----------
 .../java/ch/dissem/bitmessage/demo/Main.java  |   3 +-
 .../networking/nio/ConnectionInfo.java        |   2 +-
 .../networking/nio/NioNetworkHandler.java     |   8 +-
 .../repository/JdbcNodeRegistry.java          | 167 ++++++++++++++++++
 .../db/migration/V3.3__Create_table_node.sql  |   9 +
 .../repository/JdbcNodeRegistryTest.java      |  48 +++--
 9 files changed, 267 insertions(+), 248 deletions(-)
 delete mode 100644 core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
 create mode 100644 core/src/main/java/ch/dissem/bitmessage/ports/NodeRegistryHelper.java
 delete mode 100644 core/src/test/java/ch/dissem/bitmessage/ports/NodeRegistryTest.java
 create mode 100644 repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcNodeRegistry.java
 create mode 100644 repositories/src/main/resources/db/migration/V3.3__Create_table_node.sql

diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java b/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
deleted file mode 100644
index a56b4ff..0000000
--- a/core/src/main/java/ch/dissem/bitmessage/ports/MemoryNodeRegistry.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright 2015 Christian Basler
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.dissem.bitmessage.ports;
-
-import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
-import ch.dissem.bitmessage.exception.ApplicationException;
-import ch.dissem.bitmessage.utils.UnixTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.InetAddress;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-
-import static ch.dissem.bitmessage.utils.Collections.selectRandom;
-import static ch.dissem.bitmessage.utils.UnixTime.HOUR;
-import static java.util.Collections.newSetFromMap;
-
-public class MemoryNodeRegistry implements NodeRegistry {
-    private static final Logger LOG = LoggerFactory.getLogger(MemoryNodeRegistry.class);
-
-    private final Map<Long, Set<NetworkAddress>> stableNodes = new ConcurrentHashMap<>();
-    private final Map<Long, Set<NetworkAddress>> knownNodes = new ConcurrentHashMap<>();
-
-    private void loadStableNodes() {
-        try (InputStream in = getClass().getClassLoader().getResourceAsStream("nodes.txt")) {
-            Scanner scanner = new Scanner(in);
-            long stream = 0;
-            Set<NetworkAddress> streamSet = null;
-            while (scanner.hasNext()) {
-                try {
-                    String line = scanner.nextLine().trim();
-                    if (line.startsWith("[stream")) {
-                        stream = Long.parseLong(line.substring(8, line.lastIndexOf(']')));
-                        streamSet = new HashSet<>();
-                        stableNodes.put(stream, streamSet);
-                    } else if (streamSet != null && !line.isEmpty() && !line.startsWith("#")) {
-                        int portIndex = line.lastIndexOf(':');
-                        InetAddress[] inetAddresses = InetAddress.getAllByName(line.substring(0, portIndex));
-                        int port = Integer.valueOf(line.substring(portIndex + 1));
-                        for (InetAddress inetAddress : inetAddresses) {
-                            streamSet.add(new NetworkAddress.Builder().ip(inetAddress).port(port).stream(stream).build());
-                        }
-                    }
-                } catch (IOException e) {
-                    LOG.warn(e.getMessage(), e);
-                }
-            }
-            if (LOG.isDebugEnabled()) {
-                for (Map.Entry<Long, Set<NetworkAddress>> e : stableNodes.entrySet()) {
-                    LOG.debug("Stream " + e.getKey() + ": loaded " + e.getValue().size() + " bootstrap nodes.");
-                }
-            }
-        } catch (IOException e) {
-            throw new ApplicationException(e);
-        }
-    }
-
-    @Override
-    public List<NetworkAddress> getKnownAddresses(int limit, long... streams) {
-        List<NetworkAddress> result = new LinkedList<>();
-        for (long stream : streams) {
-            Set<NetworkAddress> known = knownNodes.get(stream);
-            if (known != null && !known.isEmpty()) {
-                for (NetworkAddress node : known) {
-                    if (node.getTime() > UnixTime.now(-3 * HOUR)) {
-                        result.add(node);
-                    } else {
-                        known.remove(node);
-                    }
-                }
-            }
-            if (result.isEmpty()) {
-                if (stableNodes.isEmpty() || stableNodes.get(stream).isEmpty()) {
-                    loadStableNodes();
-                }
-                Set<NetworkAddress> nodes = stableNodes.get(stream);
-                if (nodes != null && !nodes.isEmpty()) {
-                    // To reduce load on stable nodes, only return one
-                    result.add(selectRandom(nodes));
-                }
-            }
-        }
-        return selectRandom(limit, result);
-    }
-
-    @Override
-    public void offerAddresses(List<NetworkAddress> addresses) {
-        for (NetworkAddress node : addresses) {
-            if (node.getTime() <= UnixTime.now()) {
-                if (!knownNodes.containsKey(node.getStream())) {
-                    synchronized (knownNodes) {
-                        if (!knownNodes.containsKey(node.getStream())) {
-                            knownNodes.put(
-                                node.getStream(),
-                                newSetFromMap(new ConcurrentHashMap<NetworkAddress, Boolean>())
-                            );
-                        }
-                    }
-                }
-                if (node.getTime() <= UnixTime.now()) {
-                    // TODO: This isn't quite correct
-                    // If the node is already known, the one with the more recent time should be used
-                    knownNodes.get(node.getStream()).add(node);
-                }
-            }
-        }
-    }
-}
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/NodeRegistryHelper.java b/core/src/main/java/ch/dissem/bitmessage/ports/NodeRegistryHelper.java
new file mode 100644
index 0000000..63d70eb
--- /dev/null
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/NodeRegistryHelper.java
@@ -0,0 +1,54 @@
+package ch.dissem.bitmessage.ports;
+
+import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
+import ch.dissem.bitmessage.exception.ApplicationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.InetAddress;
+import java.util.*;
+
+/**
+ * Helper class to kick start node registries.
+ */
+public class NodeRegistryHelper {
+    private static final Logger LOG = LoggerFactory.getLogger(NodeRegistryHelper.class);
+
+    public static Map<Long, Set<NetworkAddress>> loadStableNodes() {
+        try (InputStream in = NodeRegistryHelper.class.getClassLoader().getResourceAsStream("nodes.txt")) {
+            Scanner scanner = new Scanner(in);
+            long stream = 0;
+            Map<Long, Set<NetworkAddress>> result = new HashMap<>();
+            Set<NetworkAddress> streamSet = null;
+            while (scanner.hasNext()) {
+                try {
+                    String line = scanner.nextLine().trim();
+                    if (line.startsWith("[stream")) {
+                        stream = Long.parseLong(line.substring(8, line.lastIndexOf(']')));
+                        streamSet = new HashSet<>();
+                        result.put(stream, streamSet);
+                    } else if (streamSet != null && !line.isEmpty() && !line.startsWith("#")) {
+                        int portIndex = line.lastIndexOf(':');
+                        InetAddress[] inetAddresses = InetAddress.getAllByName(line.substring(0, portIndex));
+                        int port = Integer.valueOf(line.substring(portIndex + 1));
+                        for (InetAddress inetAddress : inetAddresses) {
+                            streamSet.add(new NetworkAddress.Builder().ip(inetAddress).port(port).stream(stream).build());
+                        }
+                    }
+                } catch (IOException e) {
+                    LOG.warn(e.getMessage(), e);
+                }
+            }
+            if (LOG.isDebugEnabled()) {
+                for (Map.Entry<Long, Set<NetworkAddress>> e : result.entrySet()) {
+                    LOG.debug("Stream " + e.getKey() + ": loaded " + e.getValue().size() + " bootstrap nodes.");
+                }
+            }
+            return result;
+        } catch (IOException e) {
+            throw new ApplicationException(e);
+        }
+    }
+}
diff --git a/core/src/test/java/ch/dissem/bitmessage/ports/NodeRegistryTest.java b/core/src/test/java/ch/dissem/bitmessage/ports/NodeRegistryTest.java
deleted file mode 100644
index 993e3a9..0000000
--- a/core/src/test/java/ch/dissem/bitmessage/ports/NodeRegistryTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2016 Christian Basler
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package ch.dissem.bitmessage.ports;
-
-import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
-import ch.dissem.bitmessage.utils.UnixTime;
-import org.junit.Test;
-
-import java.util.Arrays;
-
-import static ch.dissem.bitmessage.utils.UnixTime.HOUR;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.assertThat;
-
-public class NodeRegistryTest {
-    private NodeRegistry registry = new MemoryNodeRegistry();
-
-    @Test
-    public void ensureGetKnownNodesWithoutStreamsYieldsEmpty() {
-        assertThat(registry.getKnownAddresses(10), empty());
-    }
-
-    /**
-     * Please note that this test fails if there is no internet connection,
-     * as the initial nodes' IP addresses are determined by DNS lookup.
-     */
-    @Test
-    public void ensureGetKnownNodesForStream1YieldsResult() {
-        assertThat(registry.getKnownAddresses(10, 1), hasSize(1));
-    }
-
-    @Test
-    public void ensureNodeIsStored() {
-        registry.offerAddresses(Arrays.asList(
-                new NetworkAddress.Builder()
-                        .ipv4(127, 0, 0, 1)
-                        .port(42)
-                        .stream(1)
-                        .time(UnixTime.now())
-                        .build(),
-                new NetworkAddress.Builder()
-                        .ipv4(127, 0, 0, 2)
-                        .port(42)
-                        .stream(1)
-                        .time(UnixTime.now())
-                        .build(),
-                new NetworkAddress.Builder()
-                        .ipv4(127, 0, 0, 2)
-                        .port(42)
-                        .stream(2)
-                        .time(UnixTime.now())
-                        .build()
-        ));
-        assertThat(registry.getKnownAddresses(10, 1).size(), is(2));
-        assertThat(registry.getKnownAddresses(10, 2).size(), is(1));
-        assertThat(registry.getKnownAddresses(10, 1, 2).size(), is(3));
-    }
-
-    @Test
-    public void ensureOldNodesAreRemoved() {
-        registry.offerAddresses(Arrays.asList(
-                new NetworkAddress.Builder()
-                        .ipv4(127, 0, 0, 1)
-                        .port(42)
-                        .stream(1)
-                        .time(UnixTime.now())
-                        .build(),
-                new NetworkAddress.Builder()
-                        .ipv4(127, 0, 0, 2)
-                        .port(42)
-                        .stream(1)
-                        .time(UnixTime.now(-4 * HOUR))
-                        .build(),
-                new NetworkAddress.Builder()
-                        .ipv4(127, 0, 0, 2)
-                        .port(42)
-                        .stream(2)
-                        .time(UnixTime.now())
-                        .build()
-        ));
-        assertThat(registry.getKnownAddresses(10, 1).size(), is(1));
-        assertThat(registry.getKnownAddresses(10, 2).size(), is(1));
-        assertThat(registry.getKnownAddresses(10, 1, 2).size(), is(2));
-    }
-}
diff --git a/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java b/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
index 84e8ce0..c2cc7a5 100644
--- a/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
+++ b/demo/src/main/java/ch/dissem/bitmessage/demo/Main.java
@@ -20,7 +20,6 @@ import ch.dissem.bitmessage.BitmessageContext;
 import ch.dissem.bitmessage.cryptography.bc.BouncyCryptography;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
 import ch.dissem.bitmessage.networking.nio.NioNetworkHandler;
-import ch.dissem.bitmessage.ports.MemoryNodeRegistry;
 import ch.dissem.bitmessage.ports.NodeRegistry;
 import ch.dissem.bitmessage.repository.*;
 import ch.dissem.bitmessage.wif.WifExporter;
@@ -82,7 +81,7 @@ public class Main {
                 }
             });
         } else {
-            ctxBuilder.nodeRegistry(new MemoryNodeRegistry());
+            ctxBuilder.nodeRegistry(new JdbcNodeRegistry(jdbcConfig));
         }
 
         if (options.exportWIF != null || options.importWIF != null) {
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
index fb4cf58..8ba5b66 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
@@ -129,7 +129,7 @@ public class ConnectionInfo extends AbstractConnection {
     }
 
     @Override
-    public synchronized void disconnect() {
+    public void disconnect() {
         super.disconnect();
         if (reader != null) {
             reader.cleanup();
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index 7f04aa1..0cb0af9 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -26,7 +26,7 @@ import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.NodeException;
 import ch.dissem.bitmessage.factory.V3MessageReader;
 import ch.dissem.bitmessage.ports.NetworkHandler;
-import ch.dissem.bitmessage.utils.Property;
+import ch.dissem.bitmessage.utils.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,6 +37,7 @@ import java.net.NoRouteToHostException;
 import java.nio.ByteBuffer;
 import java.nio.channels.*;
 import java.util.*;
+import java.util.Collections;
 import java.util.concurrent.*;
 
 import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.*;
@@ -193,7 +194,8 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                         }
                     }
                     if (missing > 0) {
-                        List<NetworkAddress> addresses = ctx.getNodeRegistry().getKnownAddresses(missing, ctx.getStreams());
+                        List<NetworkAddress> addresses = ctx.getNodeRegistry().getKnownAddresses(100, ctx.getStreams());
+                        addresses = selectRandom(missing, addresses);
                         for (NetworkAddress address : addresses) {
                             if (isConnectedTo(address)) {
                                 continue;
@@ -389,7 +391,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
         ConnectionInfo previous = null;
         do {
             for (ConnectionInfo connection : distribution.keySet()) {
-                if (connection == previous) {
+                if (connection == previous || previous == null) {
                     next = iterator.next();
                 }
                 if (connection.knowsOf(next)) {
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcNodeRegistry.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcNodeRegistry.java
new file mode 100644
index 0000000..7374447
--- /dev/null
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcNodeRegistry.java
@@ -0,0 +1,167 @@
+package ch.dissem.bitmessage.repository;
+
+import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
+import ch.dissem.bitmessage.exception.ApplicationException;
+import ch.dissem.bitmessage.ports.NodeRegistry;
+import ch.dissem.bitmessage.utils.Collections;
+import ch.dissem.bitmessage.utils.SqlStrings;
+import ch.dissem.bitmessage.utils.Strings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.sql.*;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static ch.dissem.bitmessage.ports.NodeRegistryHelper.loadStableNodes;
+import static ch.dissem.bitmessage.utils.UnixTime.*;
+
+public class JdbcNodeRegistry extends JdbcHelper implements NodeRegistry {
+    private static final Logger LOG = LoggerFactory.getLogger(JdbcNodeRegistry.class);
+    private Map<Long, Set<NetworkAddress>> stableNodes;
+
+    public JdbcNodeRegistry(JdbcConfig config) {
+        super(config);
+        cleanUp();
+    }
+
+    private void cleanUp() {
+        try (
+            Connection connection = config.getConnection();
+            PreparedStatement ps = connection.prepareStatement(
+                "DELETE FROM Node WHERE time<?")
+        ) {
+            ps.setLong(1, now(-28 * DAY));
+            ps.executeUpdate();
+        } catch (SQLException e) {
+            LOG.error(e.getMessage(), e);
+        }
+    }
+
+    private NetworkAddress loadExisting(NetworkAddress node) {
+        String query =
+            "SELECT stream, address, port, services, time" +
+                " FROM Node" +
+                " WHERE stream = " + node.getStream() +
+                "   AND address = X'" + Strings.hex(node.getIPv6()) + "'" +
+                "   AND port = " + node.getPort();
+        try (
+            Connection connection = config.getConnection();
+            Statement stmt = connection.createStatement();
+            ResultSet rs = stmt.executeQuery(query)
+        ) {
+            if (rs.next()) {
+                return new NetworkAddress.Builder()
+                    .stream(rs.getLong("stream"))
+                    .ipv6(rs.getBytes("address"))
+                    .port(rs.getInt("port"))
+                    .services(rs.getLong("services"))
+                    .time(rs.getLong("time"))
+                    .build();
+            } else {
+                return null;
+            }
+        } catch (Exception e) {
+            LOG.error(e.getMessage(), e);
+            throw new ApplicationException(e);
+        }
+    }
+
+    @Override
+    public List<NetworkAddress> getKnownAddresses(int limit, long... streams) {
+        List<NetworkAddress> result = new LinkedList<>();
+        String query =
+            "SELECT stream, address, port, services, time" +
+                " FROM Node WHERE stream IN (" + SqlStrings.join(streams) + ")" +
+                " ORDER BY TIME DESC" +
+                " LIMIT " + limit;
+        try (
+            Connection connection = config.getConnection();
+            Statement stmt = connection.createStatement();
+            ResultSet rs = stmt.executeQuery(query)
+        ) {
+            while (rs.next()) {
+                result.add(
+                    new NetworkAddress.Builder()
+                        .stream(rs.getLong("stream"))
+                        .ipv6(rs.getBytes("address"))
+                        .port(rs.getInt("port"))
+                        .services(rs.getLong("services"))
+                        .time(rs.getLong("time"))
+                        .build()
+                );
+            }
+        } catch (Exception e) {
+            LOG.error(e.getMessage(), e);
+            throw new ApplicationException(e);
+        }
+        if (result.isEmpty()) {
+            synchronized (this) {
+                if (stableNodes == null) {
+                    stableNodes = loadStableNodes();
+                }
+            }
+            for (long stream : streams) {
+                Set<NetworkAddress> nodes = stableNodes.get(stream);
+                if (nodes != null) {
+                    result.add(Collections.selectRandom(nodes));
+                }
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public void offerAddresses(List<NetworkAddress> nodes) {
+        cleanUp();
+        nodes.stream()
+            .filter(node -> node.getTime() < now(+24 * HOUR) && node.getTime() > now(-28 * DAY))
+            .forEach(node -> {
+                synchronized (this) {
+                    NetworkAddress existing = loadExisting(node);
+                    if (existing == null) {
+                        insert(node);
+                    } else if (node.getTime() > existing.getTime()) {
+                        update(node);
+                    }
+                }
+            });
+    }
+
+    private void insert(NetworkAddress node) {
+        try (
+            Connection connection = config.getConnection();
+            PreparedStatement ps = connection.prepareStatement(
+                "INSERT INTO Node (stream, address, port, services, time) " +
+                    "VALUES (?, ?, ?, ?, ?)")
+        ) {
+            ps.setLong(1, node.getStream());
+            ps.setBytes(2, node.getIPv6());
+            ps.setInt(3, node.getPort());
+            ps.setLong(4, node.getServices());
+            ps.setLong(5, node.getTime());
+            ps.executeUpdate();
+        } catch (SQLException e) {
+            LOG.error(e.getMessage(), e);
+        }
+    }
+
+    private void update(NetworkAddress node) {
+        try (
+            Connection connection = config.getConnection();
+            PreparedStatement ps = connection.prepareStatement(
+                "UPDATE Node SET services=?, time=? WHERE stream=? AND address=? AND port=?")
+        ) {
+            ps.setLong(1, node.getServices());
+            ps.setLong(2, node.getTime());
+            ps.setLong(3, node.getStream());
+            ps.setBytes(4, node.getIPv6());
+            ps.setInt(5, node.getPort());
+            ps.executeUpdate();
+        } catch (SQLException e) {
+            LOG.error(e.getMessage(), e);
+        }
+    }
+}
diff --git a/repositories/src/main/resources/db/migration/V3.3__Create_table_node.sql b/repositories/src/main/resources/db/migration/V3.3__Create_table_node.sql
new file mode 100644
index 0000000..5d03bb5
--- /dev/null
+++ b/repositories/src/main/resources/db/migration/V3.3__Create_table_node.sql
@@ -0,0 +1,9 @@
+CREATE TABLE Node (
+  stream   BIGINT     NOT NULL,
+  address  BINARY(32) NOT NULL,
+  port     INT        NOT NULL,
+  services BIGINT     NOT NULL,
+  time     BIGINT     NOT NULL,
+  PRIMARY KEY (stream, address, port)
+);
+CREATE INDEX idx_time on Node(time);
diff --git a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcNodeRegistryTest.java b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcNodeRegistryTest.java
index f56d973..48ae664 100644
--- a/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcNodeRegistryTest.java
+++ b/repositories/src/test/java/ch/dissem/bitmessage/repository/JdbcNodeRegistryTest.java
@@ -17,8 +17,8 @@
 package ch.dissem.bitmessage.repository;
 
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
-import ch.dissem.bitmessage.ports.MemoryNodeRegistry;
 import ch.dissem.bitmessage.ports.NodeRegistry;
+import ch.dissem.bitmessage.utils.UnixTime;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -27,8 +27,15 @@ import java.util.Collections;
 import java.util.List;
 
 import static ch.dissem.bitmessage.utils.UnixTime.now;
+import static org.hamcrest.Matchers.empty;
+import static org.hamcrest.Matchers.is;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
 
+/**
+ * Please note that some tests fail if there is no internet connection,
+ * as the initial nodes' IP addresses are determined by DNS lookup.
+ */
 public class JdbcNodeRegistryTest extends TestBase {
     private TestJdbcConfig config;
     private NodeRegistry registry;
@@ -37,21 +44,26 @@ public class JdbcNodeRegistryTest extends TestBase {
     public void setUp() throws Exception {
         config = new TestJdbcConfig();
         config.reset();
-        registry = new MemoryNodeRegistry();
+        registry = new JdbcNodeRegistry(config);
 
         registry.offerAddresses(Arrays.asList(
-                createAddress(1, 8444, 1, now()),
-                createAddress(2, 8444, 1, now()),
-                createAddress(3, 8444, 1, now()),
-                createAddress(4, 8444, 2, now())
+            createAddress(1, 8444, 1, now()),
+            createAddress(2, 8444, 1, now()),
+            createAddress(3, 8444, 1, now()),
+            createAddress(4, 8444, 2, now())
         ));
     }
 
     @Test
-    public void testInitNodes() throws Exception {
+    public void ensureGetKnownNodesWithoutStreamsYieldsEmpty() {
+        assertThat(registry.getKnownAddresses(10), empty());
+    }
+
+    @Test
+    public void ensurePredefinedNodeIsReturnedWhenDatabaseIsEmpty() throws Exception {
         config.reset();
         List<NetworkAddress> knownAddresses = registry.getKnownAddresses(2, 1);
-        assertEquals(2, knownAddresses.size());
+        assertEquals(1, knownAddresses.size());
     }
 
     @Test
@@ -66,16 +78,16 @@ public class JdbcNodeRegistryTest extends TestBase {
     @Test
     public void testOfferAddresses() throws Exception {
         registry.offerAddresses(Arrays.asList(
-                createAddress(1, 8444, 1, now()),
-                createAddress(10, 8444, 1, now()),
-                createAddress(11, 8444, 1, now())
+            createAddress(1, 8444, 1, now()),
+            createAddress(10, 8444, 1, now()),
+            createAddress(11, 8444, 1, now())
         ));
 
         List<NetworkAddress> knownAddresses = registry.getKnownAddresses(1000, 1);
         assertEquals(5, knownAddresses.size());
 
         registry.offerAddresses(Collections.singletonList(
-                createAddress(1, 8445, 1, now())
+            createAddress(1, 8445, 1, now())
         ));
 
         knownAddresses = registry.getKnownAddresses(1000, 1);
@@ -84,10 +96,10 @@ public class JdbcNodeRegistryTest extends TestBase {
 
     private NetworkAddress createAddress(int lastByte, int port, long stream, long time) {
         return new NetworkAddress.Builder()
-                .ipv6(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, lastByte)
-                .port(port)
-                .stream(stream)
-                .time(time)
-                .build();
+            .ipv6(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, lastByte)
+            .port(port)
+            .stream(stream)
+            .time(time)
+            .build();
     }
-}
\ No newline at end of file
+}

From a240606909f9aa8343f472216d17f6e38784da13 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 5 Sep 2016 19:35:36 +0200
Subject: [PATCH 79/87] Minor improvements and fixes

---
 .../dissem/bitmessage/factory/BufferPool.java | 27 ++++++++++---------
 .../networking/AbstractConnection.java        |  2 +-
 .../networking/nio/ConnectionInfo.java        |  1 +
 .../networking/nio/NioNetworkHandler.java     | 12 +++++++--
 .../repository/JdbcNodeRegistry.java          |  2 +-
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/factory/BufferPool.java b/core/src/main/java/ch/dissem/bitmessage/factory/BufferPool.java
index 1b977d7..65c1d34 100644
--- a/core/src/main/java/ch/dissem/bitmessage/factory/BufferPool.java
+++ b/core/src/main/java/ch/dissem/bitmessage/factory/BufferPool.java
@@ -47,14 +47,14 @@ class BufferPool {
     }
 
     public synchronized ByteBuffer allocate(int capacity) {
-        for (Map.Entry<Integer, Stack<ByteBuffer>> e : pools.entrySet()) {
-            if (e.getKey() >= capacity && !e.getValue().isEmpty()) {
-                return e.getValue().pop();
-            }
-        }
         Integer targetSize = getTargetSize(capacity);
-        LOG.debug("Creating new buffer of size " + targetSize);
-        return ByteBuffer.allocate(targetSize);
+        Stack<ByteBuffer> pool = pools.get(targetSize);
+        if (pool.isEmpty()) {
+            LOG.trace("Creating new buffer of size " + targetSize);
+            return ByteBuffer.allocate(targetSize);
+        } else {
+            return pool.pop();
+        }
     }
 
     /**
@@ -64,21 +64,22 @@ class BufferPool {
      */
     public synchronized ByteBuffer allocateHeaderBuffer() {
         Stack<ByteBuffer> pool = pools.get(HEADER_SIZE);
-        if (!pool.isEmpty()) {
-            return pool.pop();
-        } else {
+        if (pool.isEmpty()) {
             return ByteBuffer.allocate(HEADER_SIZE);
+        } else {
+            return pool.pop();
         }
     }
 
     public synchronized void deallocate(ByteBuffer buffer) {
         buffer.clear();
-
-        if (!pools.keySet().contains(buffer.capacity())) {
+        Stack<ByteBuffer> pool = pools.get(buffer.capacity());
+        if (pool == null) {
             throw new IllegalArgumentException("Illegal buffer capacity " + buffer.capacity() +
                 " one of " + pools.keySet() + " expected.");
+        } else {
+            pool.push(buffer);
         }
-        pools.get(buffer.capacity()).push(buffer);
     }
 
     private Integer getTargetSize(int capacity) {
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
index 4a209aa..5d0f1c5 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
@@ -145,7 +145,7 @@ public abstract class AbstractConnection {
         updateIvCache(inv.getInventory());
         List<InventoryVector> missing = ctx.getInventory().getMissing(inv.getInventory(), streams);
         missing.removeAll(commonRequestedObjects);
-        LOG.debug("Received inventory with " + originalSize + " elements, of which are "
+        LOG.trace("Received inventory with " + originalSize + " elements, of which are "
             + missing.size() + " missing.");
         send(new GetData.Builder().inventory(missing).build());
     }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
index 8ba5b66..3e53eb4 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
@@ -135,6 +135,7 @@ public class ConnectionInfo extends AbstractConnection {
             reader.cleanup();
             reader = null;
         }
+        payloadOut = null;
     }
 
     public boolean isSyncFinished() {
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index 0cb0af9..a17f378 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -239,8 +239,8 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                             }
                             e.getValue().cancel();
                             e.getValue().attach(null);
-                            it.remove();
                             e.getKey().disconnect();
+                            it.remove();
                         }
                     }
                     try {
@@ -387,12 +387,20 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                 distribution.put(connection, new LinkedList<InventoryVector>());
             }
         }
+        if (distribution.isEmpty()){
+            return;
+        }
         InventoryVector next = iterator.next();
         ConnectionInfo previous = null;
         do {
             for (ConnectionInfo connection : distribution.keySet()) {
                 if (connection == previous || previous == null) {
-                    next = iterator.next();
+                    if (iterator.hasNext()) {
+                        previous = connection;
+                        next = iterator.next();
+                    } else {
+                        break;
+                    }
                 }
                 if (connection.knowsOf(next)) {
                     List<InventoryVector> ivs = distribution.get(connection);
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcNodeRegistry.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcNodeRegistry.java
index 7374447..ae5c432 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcNodeRegistry.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcNodeRegistry.java
@@ -117,7 +117,7 @@ public class JdbcNodeRegistry extends JdbcHelper implements NodeRegistry {
     public void offerAddresses(List<NetworkAddress> nodes) {
         cleanUp();
         nodes.stream()
-            .filter(node -> node.getTime() < now(+24 * HOUR) && node.getTime() > now(-28 * DAY))
+            .filter(node -> node.getTime() < now(+2 * MINUTE) && node.getTime() > now(-28 * DAY))
             .forEach(node -> {
                 synchronized (this) {
                     NetworkAddress existing = loadExisting(node);

From 489b8968e00a3779e27b88135440fc8360efe7da Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 12 Sep 2016 08:18:30 +0200
Subject: [PATCH 80/87] Refactored use of the DefaultMessageListener so it's
 retrieved from the InternalContext

---
 .../dissem/bitmessage/BitmessageContext.java  |  61 ++++----
 .../bitmessage/DefaultMessageListener.java    |  16 +-
 .../ch/dissem/bitmessage/InternalContext.java |  33 ++--
 .../dissem/bitmessage/ProofOfWorkService.java |  18 ++-
 .../bitmessage/ports/NetworkHandler.java      |   4 +-
 .../DefaultMessageListenerTest.java           |   2 +-
 .../networking/AbstractConnection.java        |   3 +-
 .../bitmessage/networking/Connection.java     |  14 +-
 .../networking/ConnectionOrganizer.java       |   8 +-
 .../networking/DefaultNetworkHandler.java     |  13 +-
 .../bitmessage/networking/ServerRunnable.java |   8 +-
 .../networking/nio/ConnectionInfo.java        |  11 +-
 .../networking/nio/NioNetworkHandler.java     | 148 +++++++++---------
 .../networking/NetworkHandlerTest.java        |  12 +-
 .../repository/JdbcNodeRegistry.java          |   2 +-
 15 files changed, 180 insertions(+), 173 deletions(-)

diff --git a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
index b06cf9a..9e155ad 100644
--- a/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
@@ -62,16 +62,16 @@ public class BitmessageContext {
     private final InternalContext ctx;
 
     private final Labeler labeler;
-    private final NetworkHandler.MessageListener networkListener;
 
     private final boolean sendPubkeyOnIdentityCreation;
 
     private BitmessageContext(Builder builder) {
+        if (builder.listener instanceof Listener.WithContext) {
+            ((Listener.WithContext) builder.listener).setContext(this);
+        }
         ctx = new InternalContext(builder);
         labeler = builder.labeler;
         ctx.getProofOfWorkService().doMissingProofOfWork(30_000); // TODO: this should be configurable
-
-        networkListener = new DefaultMessageListener(ctx, labeler, builder.listener);
         sendPubkeyOnIdentityCreation = builder.sendPubkeyOnIdentityCreation;
     }
 
@@ -89,11 +89,11 @@ public class BitmessageContext {
 
     public BitmessageAddress createIdentity(boolean shorter, Feature... features) {
         final BitmessageAddress identity = new BitmessageAddress(new PrivateKey(
-                shorter,
-                ctx.getStreams()[0],
-                NETWORK_NONCE_TRIALS_PER_BYTE,
-                NETWORK_EXTRA_BYTES,
-                features
+            shorter,
+            ctx.getStreams()[0],
+            NETWORK_NONCE_TRIALS_PER_BYTE,
+            NETWORK_EXTRA_BYTES,
+            features
         ));
         ctx.getAddressRepository().save(identity);
         if (sendPubkeyOnIdentityCreation) {
@@ -117,9 +117,9 @@ public class BitmessageContext {
     }
 
     public List<BitmessageAddress> createDeterministicAddresses(
-            String passphrase, int numberOfAddresses, long version, long stream, boolean shorter) {
+        String passphrase, int numberOfAddresses, long version, long stream, boolean shorter) {
         List<BitmessageAddress> result = BitmessageAddress.deterministic(
-                passphrase, numberOfAddresses, version, stream, shorter);
+            passphrase, numberOfAddresses, version, stream, shorter);
         for (int i = 0; i < result.size(); i++) {
             BitmessageAddress address = result.get(i);
             address.setAlias("deterministic (" + (i + 1) + ")");
@@ -130,9 +130,9 @@ public class BitmessageContext {
 
     public void broadcast(final BitmessageAddress from, final String subject, final String message) {
         Plaintext msg = new Plaintext.Builder(BROADCAST)
-                .from(from)
-                .message(subject, message)
-                .build();
+            .from(from)
+            .message(subject, message)
+            .build();
         send(msg);
     }
 
@@ -141,10 +141,10 @@ public class BitmessageContext {
             throw new IllegalArgumentException("'From' must be an identity, i.e. have a private key.");
         }
         Plaintext msg = new Plaintext.Builder(MSG)
-                .from(from)
-                .to(to)
-                .message(subject, message)
-                .build();
+            .from(from)
+            .to(to)
+            .message(subject, message)
+            .build();
         send(msg);
     }
 
@@ -170,17 +170,17 @@ public class BitmessageContext {
                 ctx.send(msg);
             } else {
                 ctx.send(
-                        msg.getFrom(),
-                        to,
-                        Factory.getBroadcast(msg),
-                        msg.getTTL()
+                    msg.getFrom(),
+                    to,
+                    Factory.getBroadcast(msg),
+                    msg.getTTL()
                 );
             }
         }
     }
 
     public void startup() {
-        ctx.getNetworkHandler().start(networkListener);
+        ctx.getNetworkHandler().start();
     }
 
     public void shutdown() {
@@ -195,7 +195,7 @@ public class BitmessageContext {
      * @param wait             waits for the synchronization thread to finish
      */
     public void synchronize(InetAddress host, int port, long timeoutInSeconds, boolean wait) {
-        Future<?> future = ctx.getNetworkHandler().synchronize(host, port, networkListener, timeoutInSeconds);
+        Future<?> future = ctx.getNetworkHandler().synchronize(host, port, timeoutInSeconds);
         if (wait) {
             try {
                 future.get();
@@ -271,7 +271,7 @@ public class BitmessageContext {
                 broadcast.decrypt(address);
                 // This decrypts it twice, but on the other hand it doesn't try to decrypt the objects with
                 // other subscriptions and the interface stays as simple as possible.
-                networkListener.receive(object);
+                ctx.getNetworkListener().receive(object);
             } catch (DecryptionFailedException ignore) {
             } catch (Exception e) {
                 LOG.debug(e.getMessage(), e);
@@ -281,8 +281,8 @@ public class BitmessageContext {
 
     public Property status() {
         return new Property("status", null,
-                ctx.getNetworkHandler().getNetworkStatus(),
-                new Property("unacknowledged", ctx.getMessageRepository().findMessagesToResend().size())
+            ctx.getNetworkHandler().getNetworkStatus(),
+            new Property("unacknowledged", ctx.getMessageRepository().findMessagesToResend().size())
         );
     }
 
@@ -296,6 +296,13 @@ public class BitmessageContext {
 
     public interface Listener {
         void receive(Plaintext plaintext);
+
+        /**
+         * A message listener that needs a {@link BitmessageContext}, i.e. for implementing some sort of chat bot.
+         */
+        interface WithContext extends Listener {
+            void setContext(BitmessageContext ctx);
+        }
     }
 
     public static final class Builder {
@@ -429,7 +436,7 @@ public class BitmessageContext {
                     @Override
                     public MessagePayload handle(CustomMessage request) {
                         throw new IllegalStateException(
-                                "Received custom request, but no custom command handler configured.");
+                            "Received custom request, but no custom command handler configured.");
                     }
                 };
             }
diff --git a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
index b5d70d1..b61f747 100644
--- a/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
+++ b/core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
@@ -24,7 +24,6 @@ import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.exception.DecryptionFailedException;
 import ch.dissem.bitmessage.ports.Labeler;
 import ch.dissem.bitmessage.ports.NetworkHandler;
-import ch.dissem.bitmessage.utils.TTL;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -32,21 +31,24 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 
-import static ch.dissem.bitmessage.entity.Plaintext.Status.*;
-import static ch.dissem.bitmessage.utils.UnixTime.DAY;
+import static ch.dissem.bitmessage.entity.Plaintext.Status.PUBKEY_REQUESTED;
 
-class DefaultMessageListener implements NetworkHandler.MessageListener {
+class DefaultMessageListener implements NetworkHandler.MessageListener, InternalContext.ContextHolder {
     private final static Logger LOG = LoggerFactory.getLogger(DefaultMessageListener.class);
-    private final InternalContext ctx;
     private final Labeler labeler;
     private final BitmessageContext.Listener listener;
+    private InternalContext ctx;
 
-    public DefaultMessageListener(InternalContext context, Labeler labeler, BitmessageContext.Listener listener) {
-        this.ctx = context;
+    public DefaultMessageListener(Labeler labeler, BitmessageContext.Listener listener) {
         this.labeler = labeler;
         this.listener = listener;
     }
 
+    @Override
+    public void setContext(InternalContext context) {
+        this.ctx = context;
+    }
+
     @Override
     @SuppressWarnings("ConstantConditions")
     public void receive(ObjectMessage object) throws IOException {
diff --git a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
index 057bfef..e01a90a 100644
--- a/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
+++ b/core/src/main/java/ch/dissem/bitmessage/InternalContext.java
@@ -56,6 +56,7 @@ public class InternalContext {
     private final CustomCommandHandler customCommandHandler;
     private final ProofOfWorkService proofOfWorkService;
     private final Labeler labeler;
+    private final NetworkHandler.MessageListener networkListener;
 
     private final TreeSet<Long> streams = new TreeSet<>();
     private final int port;
@@ -79,6 +80,7 @@ public class InternalContext {
         this.connectionLimit = builder.connectionLimit;
         this.connectionTTL = builder.connectionTTL;
         this.labeler = builder.labeler;
+        this.networkListener = new DefaultMessageListener(labeler, builder.listener);
 
         Singleton.initialize(cryptography);
 
@@ -94,7 +96,8 @@ public class InternalContext {
         }
 
         init(cryptography, inventory, nodeRegistry, networkHandler, addressRepository, messageRepository,
-                proofOfWorkRepository, proofOfWorkService, proofOfWorkEngine, customCommandHandler, builder.labeler);
+            proofOfWorkRepository, proofOfWorkService, proofOfWorkEngine, customCommandHandler, builder.labeler,
+            networkListener);
         for (BitmessageAddress identity : addressRepository.getIdentities()) {
             streams.add(identity.getStream());
         }
@@ -148,6 +151,10 @@ public class InternalContext {
         return labeler;
     }
 
+    public NetworkHandler.MessageListener getNetworkListener() {
+        return networkListener;
+    }
+
     public long[] getStreams() {
         long[] result = new long[streams.size()];
         int i = 0;
@@ -178,10 +185,10 @@ public class InternalContext {
             long expires = UnixTime.now(+timeToLive);
             LOG.info("Expires at " + expires);
             final ObjectMessage object = new ObjectMessage.Builder()
-                    .stream(recipient.getStream())
-                    .expiresTime(expires)
-                    .payload(payload)
-                    .build();
+                .stream(recipient.getStream())
+                .expiresTime(expires)
+                .payload(payload)
+                .build();
             if (object.isSigned()) {
                 object.sign(from.getPrivateKey());
             }
@@ -201,10 +208,10 @@ public class InternalContext {
             long expires = UnixTime.now(TTL.pubkey());
             LOG.info("Expires at " + expires);
             final ObjectMessage response = new ObjectMessage.Builder()
-                    .stream(targetStream)
-                    .expiresTime(expires)
-                    .payload(identity.getPubkey())
-                    .build();
+                .stream(targetStream)
+                .expiresTime(expires)
+                .payload(identity.getPubkey())
+                .build();
             response.sign(identity.getPrivateKey());
             response.encrypt(cryptography.createPublicKey(identity.getPublicDecryptionKey()));
             // TODO: remember that the pubkey is just about to be sent, and on which stream!
@@ -239,10 +246,10 @@ public class InternalContext {
         long expires = UnixTime.now(TTL.getpubkey());
         LOG.info("Expires at " + expires);
         final ObjectMessage request = new ObjectMessage.Builder()
-                .stream(contact.getStream())
-                .expiresTime(expires)
-                .payload(new GetPubkey(contact))
-                .build();
+            .stream(contact.getStream())
+            .expiresTime(expires)
+            .payload(new GetPubkey(contact))
+            .build();
         proofOfWorkService.doProofOfWork(request);
     }
 
diff --git a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
index e9a27db..7c72bea 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ProofOfWorkService.java
@@ -11,6 +11,7 @@ import ch.dissem.bitmessage.ports.ProofOfWorkRepository.Item;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -42,7 +43,7 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
                 for (byte[] initialHash : items) {
                     Item item = powRepo.getItem(initialHash);
                     cryptography.doProofOfWork(item.object, item.nonceTrialsPerByte, item.extraBytes,
-                            ProofOfWorkService.this);
+                        ProofOfWorkService.this);
                 }
             }
         }, delayInMilliseconds);
@@ -71,7 +72,7 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
         final ObjectMessage ack = plaintext.getAckMessage();
         messageRepo.save(plaintext);
         Item item = new Item(ack, NETWORK_NONCE_TRIALS_PER_BYTE, NETWORK_EXTRA_BYTES,
-                expirationTime, plaintext);
+            expirationTime, plaintext);
         powRepo.putObject(item);
         cryptography.doProofOfWork(ack, NETWORK_NONCE_TRIALS_PER_BYTE, NETWORK_EXTRA_BYTES, this);
     }
@@ -89,15 +90,20 @@ public class ProofOfWorkService implements ProofOfWorkEngine.Callback, InternalC
                 ctx.getLabeler().markAsSent(plaintext);
                 messageRepo.save(plaintext);
             }
+            try {
+                ctx.getNetworkListener().receive(object);
+            } catch (IOException e) {
+                LOG.debug(e.getMessage(), e);
+            }
             ctx.getInventory().storeObject(object);
             ctx.getNetworkHandler().offer(object.getInventoryVector());
         } else {
             item.message.getAckMessage().setNonce(nonce);
             final ObjectMessage object = new ObjectMessage.Builder()
-                    .stream(item.message.getStream())
-                    .expiresTime(item.expirationTime)
-                    .payload(new Msg(item.message))
-                    .build();
+                .stream(item.message.getStream())
+                .expiresTime(item.expirationTime)
+                .payload(new Msg(item.message))
+                .build();
             if (object.isSigned()) {
                 object.sign(item.message.getFrom().getPrivateKey());
             }
diff --git a/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java b/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
index 9597625..e9c164e 100644
--- a/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
+++ b/core/src/main/java/ch/dissem/bitmessage/ports/NetworkHandler.java
@@ -41,7 +41,7 @@ public interface NetworkHandler {
      * An implementation should disconnect if either the timeout is reached or the returned thread is interrupted.
      * </p>
      */
-    Future<?> synchronize(InetAddress server, int port, MessageListener listener, long timeoutInSeconds);
+    Future<?> synchronize(InetAddress server, int port, long timeoutInSeconds);
 
     /**
      * Send a custom message to a specific node (that should implement handling for this message type) and returns
@@ -57,7 +57,7 @@ public interface NetworkHandler {
     /**
      * Start a full network node, accepting incoming connections and relaying objects.
      */
-    void start(MessageListener listener);
+    void start();
 
     /**
      * Stop the full network node.
diff --git a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
index 170cb93..a9bbd8c 100644
--- a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
@@ -68,7 +68,7 @@ public class DefaultMessageListenerTest extends TestBase {
         when(ctx.getNetworkHandler()).thenReturn(networkHandler);
         when(ctx.getLabeler()).thenReturn(mock(Labeler.class));
 
-        listener = new DefaultMessageListener(ctx, mock(Labeler.class), mock(BitmessageContext.Listener.class));
+        listener = new DefaultMessageListener(mock(Labeler.class), mock(BitmessageContext.Listener.class));
     }
 
     @Test
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
index 5d0f1c5..73dce63 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/AbstractConnection.java
@@ -71,14 +71,13 @@ public abstract class AbstractConnection {
 
     public AbstractConnection(InternalContext context, Mode mode,
                               NetworkAddress node,
-                              NetworkHandler.MessageListener listener,
                               Set<InventoryVector> commonRequestedObjects,
                               long syncTimeout) {
         this.ctx = context;
         this.mode = mode;
         this.host = new NetworkAddress.Builder().ipv6(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0).port(0).build();
         this.node = node;
-        this.listener = listener;
+        this.listener = context.getNetworkListener();
         this.syncTimeout = (syncTimeout > 0 ? UnixTime.now(+syncTimeout) : 0);
         this.requestedObjects = Collections.newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(10_000));
         this.ivCache = new ConcurrentHashMap<>();
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
index e2c1856..64772e5 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/Connection.java
@@ -63,29 +63,29 @@ class Connection extends AbstractConnection {
     private OutputStream out;
     private boolean socketInitialized;
 
-    public Connection(InternalContext context, Mode mode, Socket socket, MessageListener listener,
+    public Connection(InternalContext context, Mode mode, Socket socket,
                       Set<InventoryVector> requestedObjectsMap) throws IOException {
-        this(context, mode, listener, socket, requestedObjectsMap,
+        this(context, mode, socket, requestedObjectsMap,
                 new NetworkAddress.Builder().ip(socket.getInetAddress()).port(socket.getPort()).stream(1).build(),
                 0);
     }
 
-    public Connection(InternalContext context, Mode mode, NetworkAddress node, MessageListener listener,
+    public Connection(InternalContext context, Mode mode, NetworkAddress node,
                       Set<InventoryVector> requestedObjectsMap) {
-        this(context, mode, listener, new Socket(), requestedObjectsMap,
+        this(context, mode, new Socket(), requestedObjectsMap,
                 node, 0);
     }
 
-    private Connection(InternalContext context, Mode mode, MessageListener listener, Socket socket,
+    private Connection(InternalContext context, Mode mode, Socket socket,
                        Set<InventoryVector> commonRequestedObjects, NetworkAddress node, long syncTimeout) {
-        super(context, mode, node, listener, commonRequestedObjects, syncTimeout);
+        super(context, mode, node, commonRequestedObjects, syncTimeout);
         this.startTime = UnixTime.now();
         this.socket = socket;
     }
 
     public static Connection sync(InternalContext ctx, InetAddress address, int port, MessageListener listener,
                                   long timeoutInSeconds) throws IOException {
-        return new Connection(ctx, SYNC, listener, new Socket(address, port),
+        return new Connection(ctx, SYNC, new Socket(address, port),
                 new HashSet<InventoryVector>(),
                 new NetworkAddress.Builder().ip(address).port(port).stream(1).build(),
                 timeoutInSeconds);
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java b/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
index 5c976e2..42021f6 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/ConnectionOrganizer.java
@@ -42,11 +42,10 @@ public class ConnectionOrganizer implements Runnable {
     private Connection initialConnection;
 
     public ConnectionOrganizer(InternalContext ctx,
-                               DefaultNetworkHandler networkHandler,
-                               NetworkHandler.MessageListener listener) {
+                               DefaultNetworkHandler networkHandler) {
         this.ctx = ctx;
         this.networkHandler = networkHandler;
-        this.listener = listener;
+        this.listener = ctx.getNetworkListener();
     }
 
     @Override
@@ -91,8 +90,7 @@ public class ConnectionOrganizer implements Runnable {
                                 NETWORK_MAGIC_NUMBER - active, ctx.getStreams());
                         boolean first = active == 0 && initialConnection == null;
                         for (NetworkAddress address : addresses) {
-                            Connection c = new Connection(ctx, CLIENT, address, listener,
-                                    networkHandler.requestedObjects);
+                            Connection c = new Connection(ctx, CLIENT, address, networkHandler.requestedObjects);
                             if (first) {
                                 initialConnection = c;
                                 first = false;
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
index f5bfd47..762d1be 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
@@ -64,9 +64,9 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
     }
 
     @Override
-    public Future<?> synchronize(InetAddress server, int port, MessageListener listener, long timeoutInSeconds) {
+    public Future<?> synchronize(InetAddress server, int port, long timeoutInSeconds) {
         try {
-            Connection connection = Connection.sync(ctx, server, port, listener, timeoutInSeconds);
+            Connection connection = Connection.sync(ctx, server, port, ctx.getNetworkListener(), timeoutInSeconds);
             Future<?> reader = pool.submit(connection.getReader());
             pool.execute(connection.getWriter());
             return reader;
@@ -97,19 +97,16 @@ public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
     }
 
     @Override
-    public void start(final MessageListener listener) {
-        if (listener == null) {
-            throw new IllegalStateException("Listener must be set at start");
-        }
+    public void start() {
         if (running) {
             throw new IllegalStateException("Network already running - you need to stop first.");
         }
         try {
             running = true;
             connections.clear();
-            server = new ServerRunnable(ctx, this, listener);
+            server = new ServerRunnable(ctx, this);
             pool.execute(server);
-            pool.execute(new ConnectionOrganizer(ctx, this, listener));
+            pool.execute(new ConnectionOrganizer(ctx, this));
         } catch (IOException e) {
             throw new ApplicationException(e);
         }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java b/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java
index 99b6a88..3c67b95 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/ServerRunnable.java
@@ -38,11 +38,10 @@ public class ServerRunnable implements Runnable, Closeable {
     private final DefaultNetworkHandler networkHandler;
     private final NetworkHandler.MessageListener listener;
 
-    public ServerRunnable(InternalContext ctx, DefaultNetworkHandler networkHandler,
-                          NetworkHandler.MessageListener listener) throws IOException {
+    public ServerRunnable(InternalContext ctx, DefaultNetworkHandler networkHandler) throws IOException {
         this.ctx = ctx;
         this.networkHandler = networkHandler;
-        this.listener = listener;
+        this.listener = ctx.getNetworkListener();
         this.serverSocket = new ServerSocket(ctx.getPort());
     }
 
@@ -52,8 +51,7 @@ public class ServerRunnable implements Runnable, Closeable {
             try {
                 Socket socket = serverSocket.accept();
                 socket.setSoTimeout(Connection.READ_TIMEOUT);
-                networkHandler.startConnection(new Connection(ctx, SERVER, socket, listener,
-                        networkHandler.requestedObjects));
+                networkHandler.startConnection(new Connection(ctx, SERVER, socket, networkHandler.requestedObjects));
             } catch (IOException e) {
                 LOG.debug(e.getMessage(), e);
             }
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
index 3e53eb4..2e24883 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/ConnectionInfo.java
@@ -17,13 +17,15 @@
 package ch.dissem.bitmessage.networking.nio;
 
 import ch.dissem.bitmessage.InternalContext;
-import ch.dissem.bitmessage.entity.*;
+import ch.dissem.bitmessage.entity.GetData;
+import ch.dissem.bitmessage.entity.MessagePayload;
+import ch.dissem.bitmessage.entity.NetworkMessage;
+import ch.dissem.bitmessage.entity.Version;
 import ch.dissem.bitmessage.entity.valueobject.InventoryVector;
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress;
 import ch.dissem.bitmessage.exception.NodeException;
 import ch.dissem.bitmessage.factory.V3MessageReader;
 import ch.dissem.bitmessage.networking.AbstractConnection;
-import ch.dissem.bitmessage.ports.NetworkHandler;
 
 import java.nio.ByteBuffer;
 import java.util.Iterator;
@@ -43,10 +45,9 @@ public class ConnectionInfo extends AbstractConnection {
     private boolean syncFinished;
     private long lastUpdate = System.currentTimeMillis();
 
-    public ConnectionInfo(InternalContext context, Mode mode,
-                          NetworkAddress node, NetworkHandler.MessageListener listener,
+    public ConnectionInfo(InternalContext context, Mode mode, NetworkAddress node,
                           Set<InventoryVector> commonRequestedObjects, long syncTimeout) {
-        super(context, mode, node, listener, commonRequestedObjects, syncTimeout);
+        super(context, mode, node, commonRequestedObjects, syncTimeout);
         headerOut.flip();
         if (mode == CLIENT || mode == SYNC) {
             send(new Version.Builder().defaults(ctx.getClientNonce()).addrFrom(host).addrRecv(node).build());
diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index a17f378..6baa68b 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -26,7 +26,7 @@ import ch.dissem.bitmessage.exception.ApplicationException;
 import ch.dissem.bitmessage.exception.NodeException;
 import ch.dissem.bitmessage.factory.V3MessageReader;
 import ch.dissem.bitmessage.ports.NetworkHandler;
-import ch.dissem.bitmessage.utils.*;
+import ch.dissem.bitmessage.utils.Property;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -37,7 +37,6 @@ import java.net.NoRouteToHostException;
 import java.nio.ByteBuffer;
 import java.nio.channels.*;
 import java.util.*;
-import java.util.Collections;
 import java.util.concurrent.*;
 
 import static ch.dissem.bitmessage.networking.AbstractConnection.Mode.*;
@@ -47,6 +46,7 @@ import static ch.dissem.bitmessage.utils.Collections.selectRandom;
 import static ch.dissem.bitmessage.utils.DebugUtils.inc;
 import static ch.dissem.bitmessage.utils.ThreadFactoryBuilder.pool;
 import static java.nio.channels.SelectionKey.*;
+import static java.util.Collections.newSetFromMap;
 
 /**
  * Network handler using java.nio, resulting in less threads.
@@ -63,13 +63,14 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
     private InternalContext ctx;
     private Selector selector;
     private ServerSocketChannel serverChannel;
+    private Queue<NetworkAddress> connectionQueue = new ConcurrentLinkedQueue<>();
     private Map<ConnectionInfo, SelectionKey> connections = new ConcurrentHashMap<>();
-    private final Set<InventoryVector> requestedObjects = Collections.newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(10_000));
+    private final Set<InventoryVector> requestedObjects = newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(10_000));
 
     private Thread starter;
 
     @Override
-    public Future<Void> synchronize(final InetAddress server, final int port, final MessageListener listener, final long timeoutInSeconds) {
+    public Future<Void> synchronize(final InetAddress server, final int port, final long timeoutInSeconds) {
         return threadPool.submit(new Callable<Void>() {
             @Override
             public Void call() throws Exception {
@@ -77,7 +78,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                     channel.configureBlocking(false);
                     ConnectionInfo connection = new ConnectionInfo(ctx, SYNC,
                         new NetworkAddress.Builder().ip(server).port(port).stream(1).build(),
-                        listener, new HashSet<InventoryVector>(), timeoutInSeconds);
+                        new HashSet<InventoryVector>(), timeoutInSeconds);
                     while (channel.isConnected() && !connection.isSyncFinished()) {
                         write(channel, connection);
                         read(channel, connection);
@@ -135,10 +136,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
     }
 
     @Override
-    public void start(final MessageListener listener) {
-        if (listener == null) {
-            throw new IllegalStateException("Listener must be set at start");
-        }
+    public void start() {
         if (selector != null && selector.isOpen()) {
             throw new IllegalStateException("Network already running - you need to stop first.");
         }
@@ -147,42 +145,8 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
         } catch (IOException e) {
             throw new ApplicationException(e);
         }
-        thread("connection listener", new Runnable() {
-            @Override
-            public void run() {
-                try {
-                    serverChannel = ServerSocketChannel.open();
-                    serverChannel.socket().bind(new InetSocketAddress(ctx.getPort()));
-                    while (selector.isOpen() && serverChannel.isOpen()) {
-                        try {
-                            SocketChannel accepted = serverChannel.accept();
-                            accepted.configureBlocking(false);
-                            ConnectionInfo connection = new ConnectionInfo(ctx, SERVER,
-                                new NetworkAddress.Builder().address(accepted.getRemoteAddress()).stream(1).build(),
-                                listener,
-                                requestedObjects, 0
-                            );
-                            connections.put(
-                                connection,
-                                accepted.register(selector, OP_READ | OP_WRITE, connection)
-                            );
-                        } catch (AsynchronousCloseException ignore) {
-                            LOG.trace(ignore.getMessage());
-                        } catch (IOException e) {
-                            LOG.error(e.getMessage(), e);
-                        }
-                    }
-                } catch (ClosedSelectorException | AsynchronousCloseException ignore) {
-                } catch (IOException e) {
-                    throw new ApplicationException(e);
-                } catch (RuntimeException e) {
-                    e.printStackTrace();
-                    throw e;
-                }
-            }
-        });
 
-        starter = thread("connection starter", new Runnable() {
+        starter = thread("connection manager", new Runnable() {
             @Override
             public void run() {
                 while (selector.isOpen()) {
@@ -197,34 +161,8 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                         List<NetworkAddress> addresses = ctx.getNodeRegistry().getKnownAddresses(100, ctx.getStreams());
                         addresses = selectRandom(missing, addresses);
                         for (NetworkAddress address : addresses) {
-                            if (isConnectedTo(address)) {
-                                continue;
-                            }
-                            try {
-                                SocketChannel channel = SocketChannel.open();
-                                channel.configureBlocking(false);
-                                channel.connect(new InetSocketAddress(address.toInetAddress(), address.getPort()));
-                                ConnectionInfo connection = new ConnectionInfo(ctx, CLIENT,
-                                    address,
-                                    listener,
-                                    requestedObjects, 0
-                                );
-                                connections.put(
-                                    connection,
-                                    channel.register(selector, OP_CONNECT, connection)
-                                );
-                            } catch (NoRouteToHostException ignore) {
-                                // We'll try to connect to many offline nodes, so
-                                // this is expected to happen quite a lot.
-                            } catch (AsynchronousCloseException e) {
-                                // The exception is expected if the network is being
-                                // shut down, as we actually do asynchronously close
-                                // the connections.
-                                if (isRunning()) {
-                                    LOG.error(e.getMessage(), e);
-                                }
-                            } catch (IOException e) {
-                                LOG.error(e.getMessage(), e);
+                            if (!isConnectedTo(address)) {
+                                connectionQueue.offer(address);
                             }
                         }
                     }
@@ -252,17 +190,47 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
             }
         });
 
-        thread("processor", new Runnable() {
+        thread("selector worker", new Runnable() {
             @Override
             public void run() {
                 try {
+                    serverChannel = ServerSocketChannel.open();
+                    serverChannel.configureBlocking(false);
+                    serverChannel.socket().bind(new InetSocketAddress(ctx.getPort()));
+                    serverChannel.register(selector, OP_ACCEPT, null);
+
                     while (selector.isOpen()) {
                         selector.select(1000);
                         Iterator<SelectionKey> keyIterator = selector.selectedKeys().iterator();
                         while (keyIterator.hasNext()) {
                             SelectionKey key = keyIterator.next();
                             keyIterator.remove();
-                            if (key.attachment() instanceof ConnectionInfo) {
+                            if (key.attachment() == null) {
+                                try {
+                                    if (key.isAcceptable()) {
+                                        // handle accept
+                                        try {
+                                            SocketChannel accepted = ((ServerSocketChannel) key.channel()).accept();
+                                            accepted.configureBlocking(false);
+                                            ConnectionInfo connection = new ConnectionInfo(ctx, SERVER,
+                                                new NetworkAddress.Builder().address(accepted.getRemoteAddress()).stream(1).build(),
+                                                requestedObjects, 0
+                                            );
+                                            connections.put(
+                                                connection,
+                                                accepted.register(selector, OP_READ | OP_WRITE, connection)
+                                            );
+                                        } catch (AsynchronousCloseException e) {
+                                            LOG.trace(e.getMessage());
+                                        } catch (IOException e) {
+                                            LOG.error(e.getMessage(), e);
+                                        }
+                                    }
+                                } catch (CancelledKeyException e) {
+                                    LOG.error(e.getMessage(), e);
+                                }
+                            } else {
+                                // handle read/write
                                 SocketChannel channel = (SocketChannel) key.channel();
                                 ConnectionInfo connection = (ConnectionInfo) key.attachment();
                                 try {
@@ -290,6 +258,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                                 }
                             }
                         }
+                        // set interest ops
                         for (Map.Entry<ConnectionInfo, SelectionKey> e : connections.entrySet()) {
                             if (e.getValue().isValid()
                                 && (e.getValue().interestOps() & OP_WRITE) == 0
@@ -298,6 +267,35 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                                 e.getValue().interestOps(OP_READ | OP_WRITE);
                             }
                         }
+                        // start new connections
+                        if (!connectionQueue.isEmpty()) {
+                            NetworkAddress address = connectionQueue.poll();
+                            try {
+                                SocketChannel channel = SocketChannel.open();
+                                channel.configureBlocking(false);
+                                channel.connect(new InetSocketAddress(address.toInetAddress(), address.getPort()));
+                                ConnectionInfo connection = new ConnectionInfo(ctx, CLIENT,
+                                    address,
+                                    requestedObjects, 0
+                                );
+                                connections.put(
+                                    connection,
+                                    channel.register(selector, OP_CONNECT, connection)
+                                );
+                            } catch (NoRouteToHostException ignore) {
+                                // We'll try to connect to many offline nodes, so
+                                // this is expected to happen quite a lot.
+                            } catch (AsynchronousCloseException e) {
+                                // The exception is expected if the network is being
+                                // shut down, as we actually do asynchronously close
+                                // the connections.
+                                if (isRunning()) {
+                                    LOG.error(e.getMessage(), e);
+                                }
+                            } catch (IOException e) {
+                                LOG.error(e.getMessage(), e);
+                            }
+                        }
                     }
                     selector.close();
                 } catch (ClosedSelectorException ignore) {
@@ -387,7 +385,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                 distribution.put(connection, new LinkedList<InventoryVector>());
             }
         }
-        if (distribution.isEmpty()){
+        if (distribution.isEmpty()) {
             return;
         }
         InventoryVector next = iterator.next();
diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index ba24bbd..48c8cd1 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -230,9 +230,7 @@ public class NetworkHandlerTest {
             "V4Pubkey.payload"
         );
 
-        Future<?> future = nodeNetworkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
-            mock(NetworkHandler.MessageListener.class),
-            10);
+        Future<?> future = nodeNetworkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(), 10);
         future.get();
         assertInventorySize(3, nodeInventory);
         assertInventorySize(3, peerInventory);
@@ -247,9 +245,7 @@ public class NetworkHandlerTest {
 
         nodeInventory.init();
 
-        Future<?> future = nodeNetworkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
-            mock(NetworkHandler.MessageListener.class),
-            10);
+        Future<?> future = nodeNetworkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(), 10);
         future.get();
         assertInventorySize(2, nodeInventory);
         assertInventorySize(2, peerInventory);
@@ -263,9 +259,7 @@ public class NetworkHandlerTest {
             "V1Msg.payload"
         );
 
-        Future<?> future = nodeNetworkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(),
-            mock(NetworkHandler.MessageListener.class),
-            10);
+        Future<?> future = nodeNetworkHandler.synchronize(peerAddress.toInetAddress(), peerAddress.getPort(), 10);
         future.get();
         assertInventorySize(1, nodeInventory);
         assertInventorySize(1, peerInventory);
diff --git a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcNodeRegistry.java b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcNodeRegistry.java
index ae5c432..07d343a 100644
--- a/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcNodeRegistry.java
+++ b/repositories/src/main/java/ch/dissem/bitmessage/repository/JdbcNodeRegistry.java
@@ -105,7 +105,7 @@ public class JdbcNodeRegistry extends JdbcHelper implements NodeRegistry {
             }
             for (long stream : streams) {
                 Set<NetworkAddress> nodes = stableNodes.get(stream);
-                if (nodes != null) {
+                if (nodes != null && !nodes.isEmpty()) {
                     result.add(Collections.selectRandom(nodes));
                 }
             }

From 71124d7b01166d78bae1121bbf09f5e495af6890 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 12 Sep 2016 10:02:52 +0200
Subject: [PATCH 81/87] Fixed tests

---
 .../ch/dissem/bitmessage/DefaultMessageListenerTest.java   | 2 ++
 .../java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java  | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
index a9bbd8c..32a20e4 100644
--- a/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/DefaultMessageListenerTest.java
@@ -69,6 +69,8 @@ public class DefaultMessageListenerTest extends TestBase {
         when(ctx.getLabeler()).thenReturn(mock(Labeler.class));
 
         listener = new DefaultMessageListener(mock(Labeler.class), mock(BitmessageContext.Listener.class));
+        when(ctx.getNetworkListener()).thenReturn(listener);
+        listener.setContext(ctx);
     }
 
     @Test
diff --git a/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java b/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
index c4529e3..039e7ad 100644
--- a/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
+++ b/core/src/test/java/ch/dissem/bitmessage/ProofOfWorkServiceTest.java
@@ -66,6 +66,7 @@ public class ProofOfWorkServiceTest {
         when(ctx.getNetworkHandler()).thenReturn(networkHandler);
         when(ctx.getMessageRepository()).thenReturn(messageRepo);
         when(ctx.getLabeler()).thenReturn(mock(Labeler.class));
+        when(ctx.getNetworkListener()).thenReturn(mock(NetworkHandler.MessageListener.class));
 
         proofOfWorkService = new ProofOfWorkService();
         proofOfWorkService.setContext(ctx);
@@ -80,7 +81,7 @@ public class ProofOfWorkServiceTest {
         proofOfWorkService.doMissingProofOfWork(10);
 
         verify(cryptography, timeout(1000)).doProofOfWork((ObjectMessage) isNull(), eq(1001L), eq(1002L),
-                any(ProofOfWorkEngine.Callback.class));
+            any(ProofOfWorkEngine.Callback.class));
     }
 
     @Test
@@ -89,8 +90,8 @@ public class ProofOfWorkServiceTest {
         BitmessageAddress address = TestUtils.loadContact();
         Plaintext plaintext = new Plaintext.Builder(MSG).from(identity).to(address).message("", "").build();
         ObjectMessage object = new ObjectMessage.Builder()
-                .payload(new Msg(plaintext))
-                .build();
+            .payload(new Msg(plaintext))
+            .build();
         object.sign(identity.getPrivateKey());
         object.encrypt(address.getPubkey());
         byte[] initialHash = new byte[64];

From e6d40cde769b354ebfc3ed3301d4e14ba2c49a31 Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 12 Sep 2016 11:15:07 +0200
Subject: [PATCH 82/87] Try to fix tests on travis. Unfortunately they work
 fine locally, so there may be several of those attempts.

---
 .../ch/dissem/bitmessage/networking/NetworkHandlerTest.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
index 48c8cd1..d64a855 100644
--- a/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
+++ b/networking/src/test/java/ch/dissem/bitmessage/networking/NetworkHandlerTest.java
@@ -86,7 +86,7 @@ public class NetworkHandlerTest {
     }
 
     @Before
-    public void setUp() {
+    public void setUp() throws InterruptedException {
         peerInventory = new TestInventory();
         peer = new BitmessageContext.Builder()
             .addressRepo(mock(AddressRepository.class))
@@ -120,6 +120,7 @@ public class NetworkHandlerTest {
             })
             .build();
         peer.startup();
+        Thread.sleep(100);
 
         nodeInventory = new TestInventory();
         node = new BitmessageContext.Builder()

From 83abce0f520935c039c1fd438b1ecf884ee503aa Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Tue, 13 Sep 2016 07:25:23 +0200
Subject: [PATCH 83/87] Deprecate DefaultNetworkHandler in favor of
 NioNetworkHandler

---
 .../ch/dissem/bitmessage/networking/DefaultNetworkHandler.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
index 762d1be..1af62b5 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/DefaultNetworkHandler.java
@@ -43,7 +43,10 @@ import static java.util.Collections.newSetFromMap;
 
 /**
  * Handles all the networky stuff.
+ *
+ * @deprecated use {@link ch.dissem.bitmessage.networking.nio.NioNetworkHandler NioNetworkHandler} instead.
  */
+@Deprecated
 public class DefaultNetworkHandler implements NetworkHandler, ContextHolder {
 
     final Collection<Connection> connections = new ConcurrentLinkedQueue<>();

From 7e201dd2cfedd3e5b7956795be5babfe482a5a9f Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Tue, 13 Sep 2016 07:36:28 +0200
Subject: [PATCH 84/87] Change version of 'develop' branch to
 'development-SNAPSHOT'

---
 .../src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy  | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy b/buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy
index 81af76b..869d57e 100644
--- a/buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy
+++ b/buildSrc/src/main/groovy/ch/dissem/gradle/GitFlowVersion.groovy
@@ -37,7 +37,11 @@ class GitFlowVersion implements Plugin<Project> {
         if (project.ext.isRelease) {
             return getTag(project)
         } else {
-            return getBranch(project).replaceAll("/", "-") + "-SNAPSHOT"
+            def branch = getBranch(project)
+            if ("develop" == branch) {
+                return "development-SNAPSHOT"
+            }
+            return branch.replaceAll("/", "-") + "-SNAPSHOT"
         }
     }
 

From a18f76f8649a900428058c03fceed7793bb509ad Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Wed, 21 Sep 2016 19:37:17 +0200
Subject: [PATCH 85/87] Cleaning up requested objects from time to time, to
 work around a leak that sometimes happens.

---
 .../networking/nio/NioNetworkHandler.java      | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index 6baa68b..5800b38 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -53,6 +53,7 @@ import static java.util.Collections.newSetFromMap;
  */
 public class NioNetworkHandler implements NetworkHandler, InternalContext.ContextHolder {
     private static final Logger LOG = LoggerFactory.getLogger(NioNetworkHandler.class);
+    private static final long REQUESTED_OBJECTS_MAX_TIME = 30 * 60_000; // 30 minutes
 
     private final ExecutorService threadPool = Executors.newCachedThreadPool(
         pool("network")
@@ -66,6 +67,7 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
     private Queue<NetworkAddress> connectionQueue = new ConcurrentLinkedQueue<>();
     private Map<ConnectionInfo, SelectionKey> connections = new ConcurrentHashMap<>();
     private final Set<InventoryVector> requestedObjects = newSetFromMap(new ConcurrentHashMap<InventoryVector, Boolean>(10_000));
+    private long requestedObjectsTimeout = 0;
 
     private Thread starter;
 
@@ -145,6 +147,8 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
         } catch (IOException e) {
             throw new ApplicationException(e);
         }
+        requestedObjectsTimeout = System.currentTimeMillis() + REQUESTED_OBJECTS_MAX_TIME;
+        requestedObjects.clear();
 
         starter = thread("connection manager", new Runnable() {
             @Override
@@ -181,6 +185,20 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                             it.remove();
                         }
                     }
+
+                    // The list 'requested objects' helps to prevent downloading an object
+                    // twice. From time to time there is an error though, and an object is
+                    // never downloaded. To prevent a large list of failed objects and give
+                    // them a chance to get downloaded again, let's clear the list from time
+                    // to time. The timeout should be such that most of the initial object
+                    // sync should be done by then, but small enough to prevent objects with
+                    // a normal time out from not being downloaded at all.
+                    long now = System.currentTimeMillis();
+                    if (now > requestedObjectsTimeout) {
+                        requestedObjectsTimeout = now + REQUESTED_OBJECTS_MAX_TIME;
+                        requestedObjects.clear();
+                    }
+
                     try {
                         Thread.sleep(30_000);
                     } catch (InterruptedException e) {

From 579d604ac617a1ad848acae12e94160783fb75ef Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Mon, 26 Sep 2016 17:38:50 +0200
Subject: [PATCH 86/87] getRemoteAddress doesn't work on Android (at least not
 KitKat), so let's get the address this way.

---
 .../dissem/bitmessage/networking/nio/NioNetworkHandler.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
index 5800b38..f9fa06a 100644
--- a/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
+++ b/networking/src/main/java/ch/dissem/bitmessage/networking/nio/NioNetworkHandler.java
@@ -231,7 +231,11 @@ public class NioNetworkHandler implements NetworkHandler, InternalContext.Contex
                                             SocketChannel accepted = ((ServerSocketChannel) key.channel()).accept();
                                             accepted.configureBlocking(false);
                                             ConnectionInfo connection = new ConnectionInfo(ctx, SERVER,
-                                                new NetworkAddress.Builder().address(accepted.getRemoteAddress()).stream(1).build(),
+                                                new NetworkAddress.Builder()
+                                                    .ip(accepted.socket().getInetAddress())
+                                                    .port(accepted.socket().getPort())
+                                                    .stream(1)
+                                                    .build(),
                                                 requestedObjects, 0
                                             );
                                             connections.put(

From 503e665c5bc1f748d55a5dda33c5f596a0a43abe Mon Sep 17 00:00:00 2001
From: Christian Basler <chrigu.meyer@gmail.com>
Date: Sun, 2 Oct 2016 23:16:18 +0200
Subject: [PATCH 87/87] Updated README.md

---
 README.md | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 16a2528..0f536d9 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,13 @@ Be aware though that this doesn't necessarily applies for SNAPSHOT builds and th
 [![Code Quality](https://img.shields.io/codacy/e9938d2adbb74a0db553115bef692ff3/develop.svg)](https://www.codacy.com/app/chrigu-meyer/Jabit/dashboard?bid=3144279)
 [![Test Coverage](https://codecov.io/github/Dissem/Jabit/coverage.svg?branch=develop)](https://codecov.io/github/Dissem/Jabit?branch=develop)
 
+Upgrading
+---------
+
+Please be aware that Version 2.0.0 has some breaking changes, most notably in the repository implementations -- please take special care when upgrading them. If you don't implement your own repositories, you should be able to quickly find and fix any compilation errors caused by the few other breaking changes. 
+
+There is also a new network handler which comes highly recommended. If you're having any network problems, please make sure you use `NioNetworkHandler` instead of the now deprecated `DefaultNetworkHandler`.
+
 Security
 --------
 
@@ -43,19 +50,23 @@ Basically, everything needed for a working Bitmessage client is there:
 Setup
 -----
 
+It is recommended to define the version like this:
+```Gradle
+ext.jabitVersion = '2.0.0'
+```
 Add Jabit as Gradle dependency:
 ```Gradle
-compile 'ch.dissem.jabit:jabit-core:1.0.0'
+compile "ch.dissem.jabit:jabit-core:$jabitVersion"
 ```
 Unless you want to implement your own, also add the following:
 ```Gradle
-compile 'ch.dissem.jabit:jabit-networking:1.0.0'
-compile 'ch.dissem.jabit:jabit-repositories:1.0.0'
-compile 'ch.dissem.jabit:jabit-cryptography-bouncy:1.0.0'
+compile "ch.dissem.jabit:jabit-networking:$jabitVersion"
+compile "ch.dissem.jabit:jabit-repositories:$jabitVersion"
+compile "ch.dissem.jabit:jabit-cryptography-bouncy:$jabitVersion"
 ```
 And if you want to import from or export to the Wallet Import Format (used by PyBitmessage) you might also want to add:
 ```Gradle
-compile 'ch.dissem.jabit:jabit-wif:1.0.0'
+compile "ch.dissem.jabit:jabit-wif:$jabitVersion"
 ```
 
 For Android clients use `jabit-cryptography-spongy` instead of `jabit-cryptography-bouncy`.
@@ -70,8 +81,9 @@ BitmessageContext ctx = new BitmessageContext.Builder()
         .addressRepo(new JdbcAddressRepository(jdbcConfig))
         .inventory(new JdbcInventory(jdbcConfig))
         .messageRepo(new JdbcMessageRepository(jdbcConfig))
-        .nodeRegistry(new MemoryNodeRegistry())
-        .networkHandler(new NetworkNode())
+        .powRepo(new JdbcProofOfWorkRepository(jdbcConfig))
+        .nodeRegistry(new JdbcNodeRegistry(jdbcConfig))
+        .networkHandler(new NioNetworkHandler())
         .cryptography(new BouncyCryptography())
         .listener(System.out::println)
         .build();