harmony-dev · mkalinin · Oct 3, 2019 · Sep 6, 2019 · Sep 7, 2019 · Sep 7, 2019
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,36 @@
+FROM gcr.io/whiteblock/base:ubuntu1804
+
+RUN apt-get update
+RUN apt-get install -y openjdk-8-jdk
+
+# Harmony implementation depends on JVM libp2p implementation, which is not in a public repository yet.
+# So, one should build it manually and push to a local maven repository, to be able to build the node command.
+RUN git clone https://github.com/libp2p/jvm-libp2p --branch feature/cleanup
+WORKDIR /jvm-libp2p
+RUN ./gradlew build -x test
+RUN ./gradlew publishToMavenLocal
+WORKDIR /
+
+# Cloning Harmony
+RUN git clone https://github.com/harmony-dev/beacon-chain-java.git
+WORKDIR /beacon-chain-java
+# TODO: switch to develop when merged
+RUN git checkout interop
+WORKDIR /
+
+# Building Harmony
+WORKDIR /beacon-chain-java
+RUN ./gradlew build -x test
+WORKDIR start/node/build/distributions/
+RUN tar -xf node*.tar
+RUN ln -s /beacon-chain-java/start/node/build/distributions/node-*/bin/node /usr/bin/harmony
+WORKDIR /
+
+# Copying start script
+RUN mkdir /launch
+RUN cp /beacon-chain-java/scripts/whiteblock_start.sh /launch/start.sh
+RUN chmod +x /launch/start.sh
+
+EXPOSE 8545 8546 9000 30303 30303/udp
+
+ENTRYPOINT ["/bin/bash"]
diff --git a/build.gradle b/build.gradle
@@ -28,6 +28,8 @@ allprojects {
 
   repositories {
     jcenter()
+    maven { url "https://jitpack.io" }
+    maven { url "https://dl.bintray.com/libp2p/jvm-libp2p" }
   }
 
   task allDependencies(type: DependencyReportTask) {}

diff --git a/chain/src/main/java/org/ethereum/beacon/chain/DefaultBeaconChain.java b/chain/src/main/java/org/ethereum/beacon/chain/DefaultBeaconChain.java
@@ -8,9 +8,9 @@
 import org.apache.logging.log4j.Logger;
 import org.ethereum.beacon.chain.storage.BeaconChainStorage;
 import org.ethereum.beacon.chain.storage.BeaconTupleStorage;
+import org.ethereum.beacon.consensus.BeaconChainSpec;
 import org.ethereum.beacon.consensus.BeaconStateEx;
 import org.ethereum.beacon.consensus.BlockTransition;
-import org.ethereum.beacon.consensus.BeaconChainSpec;
 import org.ethereum.beacon.consensus.transition.EmptySlotTransition;
 import org.ethereum.beacon.consensus.verifier.BeaconBlockVerifier;
 import org.ethereum.beacon.consensus.verifier.BeaconStateVerifier;

diff --git a/chain/src/main/java/org/ethereum/beacon/chain/storage/util/StorageUtils.java b/chain/src/main/java/org/ethereum/beacon/chain/storage/util/StorageUtils.java
@@ -8,14 +8,11 @@
 import org.ethereum.beacon.core.state.Checkpoint;
 import tech.pegasys.artemis.ethereum.core.Hash32;
 
-/**
- * Utility functions to initialize storage from an initial state.
- */
+/** Utility functions to initialize storage from an initial state. */
 public class StorageUtils {
   /**
-   * Creates a BeaconTuple consisting of the initialState and corresponding block.
-   * Currently, the block is empty, but could be re-constructed from the state's block header,
-   * in general.
+   * Creates a BeaconTuple consisting of the initialState and corresponding block. Currently, the
+   * block is empty, but could be re-constructed from the state's block header, in general.
    */
   public static BeaconTuple createInitialBeaconTuple(
       BeaconChainSpec spec, BeaconStateEx initialState) {
@@ -26,16 +23,16 @@ public static BeaconTuple createInitialBeaconTuple(
   }
 
   /**
-   * An utility to properly initialize a storage with a specified initial state.
-   * Supports only initial state currently. Could be extended in theory, to support
-   * finalized states.
+   * An utility to properly initialize a storage with a specified initial state. Supports only
+   * initial state currently. Could be extended in theory, to support finalized states.
    */
   public static void initializeStorage(
       BeaconChainStorage storage, BeaconChainSpec spec, BeaconStateEx initialState) {
     assert storage.getTupleStorage().isEmpty();
     BeaconTuple tuple = createInitialBeaconTuple(spec, initialState);
     Hash32 genesisRoot = spec.signing_root(tuple.getBlock());
-    storage.getTupleStorage().put(tuple);
+    storage.getStateStorage().put(tuple.getBlock().getStateRoot(), tuple.getState());
+    storage.getBlockStorage().put(genesisRoot, tuple.getBlock());
     storage
         .getJustifiedStorage()
         .set(new Checkpoint(initialState.getCurrentJustifiedCheckpoint().getEpoch(), genesisRoot));

diff --git a/chain/src/test/java/org/ethereum/beacon/chain/DefaultBeaconChainTest.java b/chain/src/test/java/org/ethereum/beacon/chain/DefaultBeaconChainTest.java
@@ -1,5 +1,7 @@
 package org.ethereum.beacon.chain;
 
+import java.util.Collections;
+import java.util.stream.IntStream;
 import org.ethereum.beacon.chain.MutableBeaconChain.ImportResult;
 import org.ethereum.beacon.chain.storage.BeaconChainStorage;
 import org.ethereum.beacon.chain.storage.impl.SSZBeaconChainStorageFactory;
@@ -32,9 +34,6 @@
 import tech.pegasys.artemis.ethereum.core.Hash32;
 import tech.pegasys.artemis.util.uint.UInt64;
 
-import java.util.Collections;
-import java.util.stream.IntStream;
-
 public class DefaultBeaconChainTest {
 
   @Test

diff --git a/chain/src/test/java/org/ethereum/beacon/chain/util/SampleObservableState.java b/chain/src/test/java/org/ethereum/beacon/chain/util/SampleObservableState.java
@@ -14,6 +14,7 @@
 import org.ethereum.beacon.chain.storage.util.StorageUtils;
 import org.ethereum.beacon.consensus.BeaconChainSpec;
 import org.ethereum.beacon.consensus.BeaconStateEx;
+import org.ethereum.beacon.consensus.ChainStart;
 import org.ethereum.beacon.consensus.StateTransitions;
 import org.ethereum.beacon.consensus.TestUtils;
 import org.ethereum.beacon.consensus.transition.EmptySlotTransition;
@@ -30,7 +31,6 @@
 import org.ethereum.beacon.core.types.Time;
 import org.ethereum.beacon.crypto.BLS381.KeyPair;
 import org.ethereum.beacon.db.InMemoryDatabase;
-import org.ethereum.beacon.consensus.ChainStart;
 import org.ethereum.beacon.schedulers.Schedulers;
 import org.javatuples.Pair;
 import org.reactivestreams.Publisher;

diff --git a/core/src/main/java/org/ethereum/beacon/core/BeaconState.java b/core/src/main/java/org/ethereum/beacon/core/BeaconState.java
@@ -178,6 +178,7 @@ && getPreviousEpochAttestations().equals(other.getPreviousEpochAttestations())
         && getCurrentEpochAttestations().equals(other.getCurrentEpochAttestations())
         && getPreviousJustifiedCheckpoint().equals(other.getPreviousJustifiedCheckpoint())
         && getCurrentJustifiedCheckpoint().equals(other.getCurrentJustifiedCheckpoint())
+        && getFinalizedCheckpoint().equals(other.getFinalizedCheckpoint())
         && getPreviousCrosslinks().equals(other.getPreviousCrosslinks())
         && getCurrentCrosslinks().equals(other.getCurrentCrosslinks())
         && getBlockRoots().equals(other.getBlockRoots())

diff --git a/db/core/src/main/java/org/ethereum/beacon/db/InMemoryDatabase.java b/db/core/src/main/java/org/ethereum/beacon/db/InMemoryDatabase.java
@@ -1,6 +1,8 @@
 package org.ethereum.beacon.db;
 
 import java.util.function.Function;
+
+import org.ethereum.beacon.crypto.Hashes;
 import org.ethereum.beacon.db.source.impl.HashMapDataSource;
 
 /**
@@ -9,7 +11,7 @@
 public class InMemoryDatabase extends XorKeyDatabase {
 
   public InMemoryDatabase() {
-    super(new HashMapDataSource<>(), Function.identity());
+    super(new HashMapDataSource<>(), Hashes::sha256);
   }
 
   @Override

diff --git a/scripts/whiteblock_start.sh b/scripts/whiteblock_start.sh
@@ -0,0 +1,87 @@
+#!/bin/bash
+
+<<COMMENT
+	Used by Whiteblock for simulated network testing.
+
+	Based upon:
+	https://github.com/whiteblock/dockerfiles/blob/a31b412d32d0384de12aa8392e43bac32837b6bc/ethereum/interop-example/launch/start.sh
+
+	Here's an example script used for testing:
+
+	./whiteblock_start.sh \
+		--identity=55c7fc76505ddeb6cf750b1f9f43d6d12c1a53b77ada018a390d7592a7f36dbck \
+		--peers=/ip4/192.168.0.1/tcp/9000 \
+		--validator-keys=/tmp/keygen_10_validators.yaml \
+		--gen-state=/tmp/genesis.ssz \
+		--port=9008
+
+	The example script was run in the target/release directory of lighthouse.
+	The following change was made to this script:
+
+		YAML_KEY_FILE="/tmp/keygen_10_validators.yaml"
+COMMENT
+
+# Flags
+IDENTITY=""
+PEERS=""
+YAML_KEY_FILE="/tmp/keygen_10_validators.yaml"
+GEN_STATE=""
+PORT="8000"
+
+# Constants
+BEACON_LOG_FILE="/tmp/beacon.log"
+VALIDATOR_LOG_FILE="/tmp/validator.log"
+
+usage() {
+    echo "--identity=<hex prepresentation of the priv key for libp2p>"
+    echo "--peers=<peer>"
+    echo "--validator-keys=<path to /launch/keys.yaml>"
+    echo "--gen-state=<path to /launch/state.ssz>"
+    echo "--port=<port>"
+}
+
+CMD_LINE_ADDON=""
+while [ "$1" != "" ];
+do
+    PARAM=`echo $1 | awk -F= '{print $1}'`
+    VALUE=`echo $1 | sed 's/^[^=]*=//g'`
+
+    case $PARAM in
+        --identity)
+            IDENTITY=$VALUE
+            CMD_LINE_ADDON=$CMD_LINE_ADDON"--node-key=$IDENTITY "
+            ;;
+        --peers)
+            [ ! -z "$PEERS" ] && PEERS+=","
+	    PEERS+="$VALUE"
+	          CMD_LINE_ADDON=$CMD_LINE_ADDON"--connect=$PEERS "
+            ;;
+        --validator-keys)
+            VALIDATOR_KEYS=$VALUE
+            CMD_LINE_ADDON=$CMD_LINE_ADDON"--validators-file=$VALIDATOR_KEYS "
+            ;;
+        --gen-state)
+            GEN_STATE=$VALUE
+            CMD_LINE_ADDON=$CMD_LINE_ADDON"--initial-state=$GEN_STATE "
+            ;;
+        --port)
+            PORT=$VALUE
+            CMD_LINE_ADDON=$CMD_LINE_ADDON"--listen=$PORT "
+            ;;
+        --help)
+            usage
+            exit
+            ;;
+        *)
+            echo "ERROR: unknown parameter \"$PARAM\""
+            usage
+            exit 1
+            ;;
+    esac
+    shift
+done
+
+/usr/bin/harmony default --spec-constants=minimal $CMD_LINE_ADDON
+
+trap 'trap - SIGTERM && kill 0' SIGINT SIGTERM EXIT
+
diff --git a/ssz/src/main/java/org/ethereum/beacon/ssz/annotation/SSZSerializable.java b/ssz/src/main/java/org/ethereum/beacon/ssz/annotation/SSZSerializable.java
@@ -56,4 +56,11 @@ interface VoidBasicAccessor extends Void, SSZBasicAccessor {}
    * Specifies custom container accessor for SSZ serializable class
    */
   Class<? extends SSZContainerAccessor> containerAccessor() default VoidContainerAccessor.class;
+
+  /**
+   * Applicable to SSZ Containers with a single child only
+   * When set to true the wrapping container is not serialized, and its child
+   * is serialized the same way as if it was serialized directly
+   */
+  boolean skipContainer() default false;
 }
diff --git a/ssz/src/main/java/org/ethereum/beacon/ssz/visitor/SSZVisitorHost.java b/ssz/src/main/java/org/ethereum/beacon/ssz/visitor/SSZVisitorHost.java
@@ -8,9 +8,9 @@
 
 import org.ethereum.beacon.ssz.type.SSZBasicType;
 import org.ethereum.beacon.ssz.type.SSZContainerType;
-import org.ethereum.beacon.ssz.type.list.SSZListType;
 import org.ethereum.beacon.ssz.type.SSZType;
 import org.ethereum.beacon.ssz.type.SSZUnionType;
+import org.ethereum.beacon.ssz.type.list.SSZListType;
 
 public class SSZVisitorHost {
 
@@ -29,7 +29,7 @@ public  <ResultType, ParamType> ResultType handleAny(
           handleAny(unionType.getChildTypes().get(idx), param, visitor));
     } else if (type.getType() == CONTAINER) {
       SSZContainerType containerType = (SSZContainerType) type;
-      return visitor.visitComposite(containerType, value, (idx, param) ->
+      return visitor.visitContainer(containerType, value, (idx, param) ->
           handleAny(containerType.getChildTypes().get(idx), param, visitor));
     } else {
       throw new IllegalArgumentException("Unknown type: " + type);

diff --git a/ssz/src/main/java/org/ethereum/beacon/ssz/visitor/SosDeserializer.java b/ssz/src/main/java/org/ethereum/beacon/ssz/visitor/SosDeserializer.java
@@ -8,12 +8,13 @@
 import java.util.List;
 import net.consensys.cava.bytes.Bytes;
 import org.ethereum.beacon.ssz.access.SSZCompositeAccessor.CompositeInstanceBuilder;
+import org.ethereum.beacon.ssz.annotation.SSZSerializable;
 import org.ethereum.beacon.ssz.type.SSZBasicType;
 import org.ethereum.beacon.ssz.type.SSZCompositeType;
 import org.ethereum.beacon.ssz.type.SSZContainerType;
-import org.ethereum.beacon.ssz.type.list.SSZListType;
 import org.ethereum.beacon.ssz.type.SSZType;
 import org.ethereum.beacon.ssz.type.SSZUnionType;
+import org.ethereum.beacon.ssz.type.list.SSZListType;
 import org.javatuples.Pair;
 
 /**
@@ -51,6 +52,26 @@ public Object visitUnion(SSZUnionType type, Bytes bytes,
     return instanceBuilder.build();
   }
 
+  @Override
+  public Object visitContainer(SSZContainerType type, Bytes param,
+      ChildVisitor<Bytes, Object> childVisitor) {
+    SSZSerializable annotation = type.getTypeDescriptor().getRawClass()
+        .getAnnotation(SSZSerializable.class);
+    if (annotation != null && annotation.skipContainer()) {
+      if (type.getChildTypes().size() != 1) {
+        throw new IllegalArgumentException(
+            "Only container with a single child can be skipped: " + type);
+      }
+      CompositeInstanceBuilder instanceBuilder =
+          type.getAccessor().createInstanceBuilder(type);
+      Object child = childVisitor.apply(0, param);
+      instanceBuilder.setChild(0, child);
+      return instanceBuilder.build();
+    } else {
+      return visitComposite(type, param, childVisitor);
+    }
+  }
+
   /**
    * Decodes composite value
    *

diff --git a/ssz/src/main/java/org/ethereum/beacon/ssz/visitor/SosSerializer.java b/ssz/src/main/java/org/ethereum/beacon/ssz/visitor/SosSerializer.java
@@ -1,19 +1,20 @@
 package org.ethereum.beacon.ssz.visitor;
 
+import static org.ethereum.beacon.ssz.visitor.SosDeserializer.BYTES_PER_LENGTH_OFFSET;
+
+import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
+import java.util.List;
 import org.ethereum.beacon.ssz.access.SSZUnionAccessor.UnionInstanceAccessor;
+import org.ethereum.beacon.ssz.annotation.SSZSerializable;
 import org.ethereum.beacon.ssz.type.SSZBasicType;
 import org.ethereum.beacon.ssz.type.SSZCompositeType;
-import org.ethereum.beacon.ssz.type.list.SSZListType;
+import org.ethereum.beacon.ssz.type.SSZContainerType;
 import org.ethereum.beacon.ssz.type.SSZUnionType;
+import org.ethereum.beacon.ssz.type.list.SSZListType;
 import tech.pegasys.artemis.util.bytes.BytesValue;
 import tech.pegasys.artemis.util.bytes.BytesValues;
 
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.ethereum.beacon.ssz.visitor.SosDeserializer.BYTES_PER_LENGTH_OFFSET;
-
 /** SSZ serializer with offset-based encoding of variable sized elements */
 public class SosSerializer implements SSZVisitor<SosSerializer.SerializerResult, Object> {
 
@@ -66,6 +67,23 @@ public SerializerResult visitComposite(
     return visitComposite(type, rawValue, childVisitor, 0, type.getChildrenCount(rawValue));
   }
 
+  @Override
+  public SerializerResult visitContainer(SSZContainerType type, Object param,
+      ChildVisitor<Object, SerializerResult> childVisitor) {
+
+    SSZSerializable annotation = type.getTypeDescriptor().getRawClass()
+        .getAnnotation(SSZSerializable.class);
+    if (annotation != null && annotation.skipContainer()) {
+      if (type.getChildTypes().size() != 1) {
+        throw new IllegalArgumentException(
+            "Only container with a single child can be skipped: " + type);
+      }
+      return childVisitor.apply(0, type.getChild(param, 0));
+    } else {
+      return visitComposite(type, param, childVisitor);
+    }
+  }
+
   private SerializerResult visitComposite(
       SSZCompositeType type,
       Object rawValue,