Development

common/pom.xml

@@ -127,6 +127,11 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>io.bisq</groupId>
+            <artifactId>consensus</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>

common/src/main/java/io/bisq/common/app/DevEnv.java

@@ -10,15 +10,15 @@ public class DevEnv {
     // peer (click user icon and alt+r), filter/block offers by various data like offer ID (cmd + f).
     // The user can set a program argument to ignore all of those privileged network_messages. They are intended for
     // emergency cases only (beside update message and arbitrator registration).
-    public static final boolean USE_DEV_PRIVILEGE_KEYS = false;
+    public static final boolean USE_DEV_PRIVILEGE_KEYS = true;
     public static final String DEV_PRIVILEGE_PUB_KEY = "027a381b5333a56e1cc3d90d3a7d07f26509adf7029ed06fc997c656621f8da1ee";
     public static final String DEV_PRIVILEGE_PRIV_KEY = "6ac43ea1df2a290c1c8391736aa42e4339c5cb4f110ff0257a13b63211977b7a";
 
 
     // If set to true we ignore several UI behavior like confirmation popups as well dummy accounts are created and 
     // offers are filled with default values. Intended to make dev testing faster.
     @SuppressWarnings("PointlessBooleanExpression")
-    public static final boolean DEV_MODE = STRESS_TEST_MODE || false;
+    public static final boolean DEV_MODE = STRESS_TEST_MODE || true;
 
     public static final boolean DAO_PHASE2_ACTIVATED = false;
 }

common/src/main/java/io/bisq/common/crypto/CryptoUtils.java

@@ -20,6 +20,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.security.PublicKey;
+import java.security.SecureRandom;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.Base64;
 
@@ -29,5 +30,11 @@ public static String pubKeyToString(PublicKey publicKey) {
         final X509EncodedKeySpec x509EncodedKeySpec = new X509EncodedKeySpec(publicKey.getEncoded());
         return Base64.getEncoder().encodeToString(x509EncodedKeySpec.getEncoded());
     }
+
+    public static byte[] getRandomBytes(int size) {
+        byte[] bytes = new byte[size];
+        new SecureRandom().nextBytes(bytes);
+        return bytes;
+    }
 }
 

common/src/main/java/io/bisq/common/crypto/Hash.java

@@ -18,29 +18,28 @@
 package io.bisq.common.crypto;
 
 import com.google.common.base.Charsets;
-import org.bouncycastle.util.encoders.Hex;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.bitcoinj.core.Utils;
 
 import java.nio.ByteBuffer;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.security.NoSuchProviderException;
 
+@Slf4j
 public class Hash {
-    private static final Logger log = LoggerFactory.getLogger(Hash.class);
 
     /**
      * @param data Data as byte array
      * @return Hash of data
      */
-    public static byte[] getHash(byte[] data) {
+    public static byte[] getSha256Hash(byte[] data) {
         try {
             MessageDigest digest = MessageDigest.getInstance("SHA-256", "BC");
             digest.update(data, 0, data.length);
             return digest.digest();
         } catch (NoSuchAlgorithmException | NoSuchProviderException e) {
-            log.error("Could not create MessageDigest for hash. " + e.getMessage());
+            log.error("Could not create MessageDigest for hash. " + e.toString());
             e.printStackTrace();
             throw new RuntimeException(e);
         }
@@ -50,24 +49,23 @@ public static byte[] getHash(byte[] data) {
      * @param message UTF-8 encoded message
      * @return Hash of data
      */
-    public static byte[] getHash(String message) {
-        return getHash(message.getBytes(Charsets.UTF_8));
+    public static byte[] getSha256Hash(String message) {
+        return getSha256Hash(message.getBytes(Charsets.UTF_8));
     }
 
     /**
-     * @param message UTF-8 encoded message
-     * @return Hex string of hash of data
+     * @param data data as Integer
+     * @return Hash of data
      */
-    public static String getHashAsHex(String message) {
-        return Hex.toHexString(message.getBytes(Charsets.UTF_8));
+    public static byte[] getSha256Hash(Integer data) {
+        return getSha256Hash(ByteBuffer.allocate(4).putInt(data).array());
     }
 
     /**
-     * @param data data as Integer
-     * @return Hash of data
+     * Calculates RIPEMD160(SHA256(input)).
      */
-    public static byte[] getHash(Integer data) {
-        return getHash(ByteBuffer.allocate(4).putInt(data).array());
+    public static byte[] getSha256Ripemd160hash(byte[] data) {
+        return Utils.sha256hash160(data);
     }
 
 }

common/src/main/java/io/bisq/common/crypto/PubKeyRing.java

@@ -20,6 +20,7 @@
 import com.google.protobuf.ByteString;
 import io.bisq.common.proto.network.NetworkPayload;
 import io.bisq.common.util.Utilities;
+import io.bisq.consensus.RestrictedByContractJson;
 import io.bisq.generated.protobuffer.PB;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -36,7 +37,7 @@
 @Slf4j
 @EqualsAndHashCode
 @Getter
-public final class PubKeyRing implements NetworkPayload {
+public final class PubKeyRing implements NetworkPayload, RestrictedByContractJson {
     private final byte[] signaturePubKeyBytes;
     private final byte[] encryptionPubKeyBytes;
     @Nullable

common/src/main/java/io/bisq/common/locale/CurrencyUtil.java

@@ -96,7 +96,7 @@ public static List<CryptoCurrency> createAllSortedCryptoCurrenciesList() {
         result.add(new CryptoCurrency("DNET", "DarkNet"));
         if (!baseCurrencyCode.equals("DASH"))
             result.add(new CryptoCurrency("DASH", "Dash"));
-        result.add(new CryptoCurrency("DEC", "DECENT"));
+        result.add(new CryptoCurrency("DCT", "DECENT"));
         result.add(new CryptoCurrency("DCR", "Decred"));
         if (!baseCurrencyCode.equals("DOGE"))
             result.add(new CryptoCurrency("DOGE", "Dogecoin"));
@@ -248,7 +248,7 @@ public static Optional<TradeCurrency> getTradeCurrency(String currencyCode) {
             if (isCryptoCurrency(currencyCode) && cryptoCurrencyOptional.isPresent()) {
                 return Optional.of(cryptoCurrencyOptional.get());
             } else {
-                return Optional.empty();
+                return Optional.<TradeCurrency>empty();
             }
         }
     }

common/src/main/java/io/bisq/common/proto/ProtoResolver.java

@@ -18,8 +18,11 @@
 package io.bisq.common.proto;
 
 import io.bisq.common.Payload;
+import io.bisq.common.proto.persistable.PersistableEnvelope;
 import io.bisq.generated.protobuffer.PB;
 
 public interface ProtoResolver {
     Payload fromProto(PB.PaymentAccountPayload proto);
+
+    PersistableEnvelope fromProto(PB.PersistableNetworkPayload proto);
 }

common/src/main/java/io/bisq/common/proto/persistable/PersistableHashMap.java

@@ -23,26 +23,27 @@
 import lombok.experimental.Delegate;
 
 import java.util.HashMap;
+import java.util.Map;
 import java.util.function.Function;
 
-public class PersistableHashMap<K extends PersistablePayload, V extends PersistablePayload> implements PersistableEnvelope {
+public class PersistableHashMap<K, V extends PersistablePayload> implements PersistableEnvelope {
     @Delegate
     @Getter
-    private HashMap<K, V> hashMap = new HashMap<>();
+    private Map<K, V> map = new HashMap<>();
     @Setter
-    private Function<HashMap<K, V>, Message> toProto;
+    private Function<Map<K, V>, Message> toProto;
 
-    public PersistableHashMap(HashMap<K, V> hashMap) {
-        this.hashMap = hashMap;
+    public PersistableHashMap(Map<K, V> map) {
+        this.map = map;
     }
 
-    public PersistableHashMap(HashMap<K, V> hashMap, Function<HashMap<K, V>, Message> toProto) {
-        this(hashMap);
+    public PersistableHashMap(Map<K, V> map, Function<Map<K, V>, Message> toProto) {
+        this(map);
         this.toProto = toProto;
     }
 
     @Override
     public Message toProtoMessage() {
-        return toProto.apply(hashMap);
+        return toProto.apply(map);
     }
 }

common/src/main/java/io/bisq/common/util/Utilities.java

@@ -24,6 +24,7 @@
 import io.bisq.common.crypto.LimitedKeyStrengthException;
 import javafx.scene.input.*;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.bitcoinj.core.Utils;
@@ -37,10 +38,7 @@
 import java.security.NoSuchAlgorithmException;
 import java.security.Permission;
 import java.security.PermissionCollection;
-import java.util.Collection;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Random;
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
@@ -56,11 +54,11 @@ public class Utilities {
     // TODO check out Jackson lib
     public static String objectToJson(Object object) {
         Gson gson = new GsonBuilder()
-                .setExclusionStrategies(new AnnotationExclusionStrategy())
+            .setExclusionStrategies(new AnnotationExclusionStrategy())
                 /*.excludeFieldsWithModifiers(Modifier.TRANSIENT)*/
               /*  .setFieldNamingPolicy(FieldNamingPolicy.UPPER_CAMEL_CASE)*/
-                .setPrettyPrinting()
-                .create();
+            .setPrettyPrinting()
+            .create();
         return gson.toJson(object);
     }
 
@@ -76,11 +74,11 @@ public static ThreadPoolExecutor getThreadPoolExecutor(String name,
                                                            int maximumPoolSize,
                                                            long keepAliveTimeInSec) {
         final ThreadFactory threadFactory = new ThreadFactoryBuilder()
-                .setNameFormat(name)
-                .setDaemon(true)
-                .build();
+            .setNameFormat(name)
+            .setDaemon(true)
+            .build();
         ThreadPoolExecutor executor = new ThreadPoolExecutor(corePoolSize, maximumPoolSize, keepAliveTimeInSec,
-                TimeUnit.SECONDS, new ArrayBlockingQueue<>(maximumPoolSize), threadFactory);
+            TimeUnit.SECONDS, new ArrayBlockingQueue<>(maximumPoolSize), threadFactory);
         executor.allowCoreThreadTimeOut(true);
         executor.setRejectedExecutionHandler((r, e) -> log.debug("RejectedExecutionHandler called"));
         return executor;
@@ -93,10 +91,10 @@ public static ScheduledThreadPoolExecutor getScheduledThreadPoolExecutor(String
                                                                              int maximumPoolSize,
                                                                              long keepAliveTimeInSec) {
         final ThreadFactory threadFactory = new ThreadFactoryBuilder()
-                .setNameFormat(name)
-                .setDaemon(true)
-                .setPriority(Thread.MIN_PRIORITY)
-                .build();
+            .setNameFormat(name)
+            .setDaemon(true)
+            .setPriority(Thread.MIN_PRIORITY)
+            .build();
         ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(corePoolSize, threadFactory);
         executor.setKeepAliveTime(keepAliveTimeInSec, TimeUnit.SECONDS);
         executor.allowCoreThreadTimeOut(true);
@@ -134,8 +132,8 @@ public static String getOSArchitecture() {
             String arch = System.getenv("PROCESSOR_ARCHITECTURE");
             String wow64Arch = System.getenv("PROCESSOR_ARCHITEW6432");
             return arch.endsWith("64")
-                    || wow64Arch != null && wow64Arch.endsWith("64")
-                    ? "64" : "32";
+                || wow64Arch != null && wow64Arch.endsWith("64")
+                ? "64" : "32";
         } else if (osArch.contains("arm")) {
             // armv8 is 64 bit, armv7l is 32 bit
             return osArch.contains("64") || osArch.contains("v8") ? "64" : "32";
@@ -148,12 +146,12 @@ public static String getOSArchitecture() {
 
     public static void printSysInfo() {
         log.info("System info: os.name={}; os.version={}; os.arch={}; sun.arch.data.model={}; JRE={}; JVM={}",
-                System.getProperty("os.name"),
-                System.getProperty("os.version"),
-                System.getProperty("os.arch"),
-                getJVMArchitecture(),
-                (System.getProperty("java.runtime.version", "-") + " (" + System.getProperty("java.vendor", "-") + ")"),
-                (System.getProperty("java.vm.version", "-") + " (" + System.getProperty("java.vm.name", "-") + ")")
+            System.getProperty("os.name"),
+            System.getProperty("os.version"),
+            System.getProperty("os.arch"),
+            getJVMArchitecture(),
+            (System.getProperty("java.runtime.version", "-") + " (" + System.getProperty("java.vendor", "-") + ")"),
+            (System.getProperty("java.vm.version", "-") + " (" + System.getProperty("java.vm.name", "-") + ")")
         );
     }
 
@@ -175,8 +173,8 @@ public static boolean isCorrectOSArchitecture() {
 
     public static void openURI(URI uri) throws IOException {
         if (!isLinux()
-                && isDesktopSupported()
-                && getDesktop().isSupported(Action.BROWSE)) {
+            && isDesktopSupported()
+            && getDesktop().isSupported(Action.BROWSE)) {
             getDesktop().browse(uri);
         } else {
             // Maybe Application.HostServices works in those cases?
@@ -192,8 +190,8 @@ && getDesktop().isSupported(Action.BROWSE)) {
 
     public static void openFile(File file) throws IOException {
         if (!isLinux()
-                && isDesktopSupported()
-                && getDesktop().isSupported(Action.OPEN)) {
+            && isDesktopSupported()
+            && getDesktop().isSupported(Action.OPEN)) {
             getDesktop().open(file);
         } else {
             // Maybe Application.HostServices works in those cases?
@@ -258,7 +256,7 @@ public static byte[] concatByteArrays(byte[]... arrays) {
 
     public static <T> T jsonToObject(String jsonString, Class<T> classOfT) {
         Gson gson =
-                new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.UPPER_CAMEL_CASE).setPrettyPrinting().create();
+            new GsonBuilder().setFieldNamingPolicy(FieldNamingPolicy.UPPER_CAMEL_CASE).setPrettyPrinting().create();
         return gson.fromJson(jsonString, classOfT);
     }
 
@@ -372,13 +370,35 @@ public static boolean isAltOrCtrlPressed(KeyCode keyCode, KeyEvent keyEvent) {
 
     public static boolean isCtrlPressed(KeyCode keyCode, KeyEvent keyEvent) {
         return new KeyCodeCombination(keyCode, KeyCombination.SHORTCUT_DOWN).match(keyEvent) ||
-                new KeyCodeCombination(keyCode, KeyCombination.CONTROL_DOWN).match(keyEvent);
+            new KeyCodeCombination(keyCode, KeyCombination.CONTROL_DOWN).match(keyEvent);
     }
 
     public static boolean isAltPressed(KeyCode keyCode, KeyEvent keyEvent) {
         return new KeyCodeCombination(keyCode, KeyCombination.ALT_DOWN).match(keyEvent);
     }
 
+    public static byte[] concatenateByteArrays(byte[] array1, byte[] array2) {
+        return ArrayUtils.addAll(array1, array2);
+    }
+
+    public static byte[] concatenateByteArrays(byte[] array1, byte[] array2, byte[] array3) {
+        return ArrayUtils.addAll(array1, ArrayUtils.addAll(array2, array3));
+    }
+
+    public static byte[] concatenateByteArrays(byte[] array1, byte[] array2, byte[] array3, byte[] array4) {
+        return ArrayUtils.addAll(array1, ArrayUtils.addAll(array2, ArrayUtils.addAll(array3, array4)));
+    }
+
+    public static byte[] concatenateByteArrays(byte[] array1, byte[] array2, byte[] array3, byte[] array4, byte[] array5) {
+        return ArrayUtils.addAll(array1, ArrayUtils.addAll(array2, ArrayUtils.addAll(array3, ArrayUtils.addAll(array4, array5))));
+    }
+
+    public static Date getUTCDate(int year, int month, int dayOfMonth) {
+        GregorianCalendar calendar = new GregorianCalendar(year, month, dayOfMonth);
+        calendar.setTimeZone(TimeZone.getTimeZone("UTC"));
+        return calendar.getTime();
+    }
+
     private static class AnnotationExclusionStrategy implements ExclusionStrategy {
         @Override
         public boolean shouldSkipField(FieldAttributes f) {
@@ -503,6 +523,6 @@ public static boolean isRestrictedCryptography() {
         final String name = System.getProperty("java.runtime.name");
         final String ver = System.getProperty("java.version");
         return name != null && name.equals("Java(TM) SE Runtime Environment")
-                && ver != null && (ver.startsWith("1.7") || ver.startsWith("1.8"));
+            && ver != null && (ver.startsWith("1.7") || ver.startsWith("1.8"));
     }
 }