refactor BundleValidator.validate

.gitignore

@@ -46,6 +46,17 @@ spent-addresses-log
 *.snapshot.meta.bkp
 *.snapshot.state.bkp
 snapshot-*/*
+mainnet-db-log/
+mainnet-db/
+mainnet-snapshot/
+mainnet-spent-addresses-db-log/
+mainnet-spent-addresses-db/
+testnet-db-log/
+testnet-db/
+testnet-snapshot/
+testnet-spent-addresses-db-log/
+testnet-spent-addresses-db/
+
 
 # modules
 XI
@@ -67,3 +78,4 @@ Validator.*
 
 # os
 .DS_Store
+Makefile

CHANGELOG.md

@@ -1,6 +1,21 @@
+## 1.0.6
+- Configuration flag names used on command line (by Jcommander) were changed from kabab-case to snake_case to match the config.ini style (used by Jackson).
+- Renaming/Refactoring config variables to identify explicit purpose for devops
+- Renaming/Refactoring double negative variable names for reader sanity
+- Previous versions did not distinguish between testnet and mainnet db and db-log paths for spent-addresses. This was fixed. Depending on the net setting (**{test}**net vs. **{main}**net), by default, pendulum state is stored in:
+```
+{x}net-db-log/
+{x}net-db/
+{x}net-snapshot/
+{x}net-spent-addresses-db-log/
+{x}net-spent-addresses-db/
+```
+Additional state is stored in the ./logs directory.
+
+
 ## 1.0.5
 -  Fixed `getBalance`: `RoundViewModel.get()` returns null on `index`=0, thus NPE was thrown when `references` were not passed and the first round hadn't been completed. In our implementation the snapshot is already constructed based on relative confirmations, thus it suffices for `getBalances` to respond with balance according to `latestSnapshot`.
--  Updated `previousEpochsSpentAddresses` resource files 
+-  Updated `previousEpochsSpentAddresses` resource files
 
 ## 1.0.4
 -  Fixed several zmq publish statements in which an incorrect format was specified.

README.md

@@ -6,7 +6,7 @@
 
 Pendulum is a quorum based [Tangle](https://github.com/iotaledger/iri/) implementation designed towards reliable timekeeping and high-throughput messaging.
 
--   **Latest release:** 1.0.5 pre-release
+-   **Latest release:** 1.0.6 pre-release
 -   **License:** GPLv3
 
 Special thanks to all of the [IOTA Contributors](https://github.com/iotaledger/iri/graphs/contributors)!
@@ -196,6 +196,7 @@ Currently the following topics are covered:
 | `nav`       | newly added validators                                                  |
 | `nrv`       | newly removed validators                                                |
 | `cvs`       | current validators                                                      |
+| `sldf`      | transactions recently solidified by the node                            | 
 | `<Address>` | Watching all traffic on a specified address                             |
 
 <!-- [1]: https://javadoc-badge.appspot.com/helixnetwork/helix-1.0.svg?label=javadocs -->

docker/docker-compose-dev.yml

@@ -0,0 +1,66 @@
+version: "3.1"
+
+networks:
+  helix_network:
+
+secrets:
+  seed:
+    file: .seed #
+
+services:
+  relayer:
+    container_name: relayer
+    # build first
+    image: ${DOCKER_IMAGE}
+    hostname: relayer
+    restart: on-failure
+    volumes:
+       - ../target/pendulum-1.0.3.jar:/pendulum/target/pendulum-dev.jar
+    # uncomment if you need persistent data
+    #  - /docker-volumes/relayer/data:/pendulum/data
+    environment:
+      - DOCKER_PLM_JAR_FILE=pendulum-dev.jar
+      - DOCKER_PLM_REMOTE_LIMIT_API="interruptAttachToTangle"
+      - JAVA_MAX_MEMORY=500m
+      - JAVA_MIN_MEMORY=256m
+      - DOCKER_PLM_LOGGING_LEVEL=debug
+      - JAVA_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5044
+    ports:
+      - "6550:6550"
+      - "8085:8085"
+      - "5044:5044"
+    expose:
+      - "4100"
+    command: ["-p","8085","-n", "udp://backend:4100", "--testnet"]
+    networks:
+      helix_network:
+
+  backend:
+    container_name: backend
+    image: ${DOCKER_IMAGE}
+    hostname: backend
+    restart: on-failure
+    volumes:
+      - ../target/pendulum-1.0.3.jar:/pendulum/target/pendulum-dev.jar
+    #volumes:
+    #  - /docker-volumes/backend/data:/pendulum/data
+    #  - ./backend/seed.txt:/pendulum/conf/seed.txt:ro
+    environment:
+      - DOCKER_PLM_REMOTE_LIMIT_API="interruptAttachToTangle"
+      - DOCKER_PLM_JAR_FILE=pendulum-dev.jar
+      - JAVA_MAX_MEMORY=500m
+      - JAVA_MIN_MEMORY=256m
+      - DOCKER_PLM_LOGGING_LEVEL=debug
+      - JAVA_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5045
+    ports:
+      - "6551:6550"
+      - "8086:8085"
+      - "5045:5045"
+    expose:
+      - "4100"
+    secrets:
+      - seed
+    command: ["-p","8085","-n", "udp://relayer:4100", "--testnet", "--validator", "/run/secrets/seed"]
+    networks:
+      helix_network:
+

docker/run-dev.sh

@@ -0,0 +1,83 @@
+#!/bin/bash
+
+usage() {
+    echo "Usage (local build + run): run-dev --build --image <image_name>"
+    echo "Usage (git build + run): run-dev --git <branch> --image <image_name>"
+    echo "Usage (pull + run): run-dev --image <image>"
+    echo "Usage (local jar): run-dev --jar "
+    echo "  (optional) with validator seed: --seed <validator seed>"
+}
+
+run() {
+  echo "killing compose"
+  docker-compose -f docker-compose-dev.yml down
+  echo "spinning up compose"
+  docker-compose -f docker-compose-dev.yml up -d
+}
+
+restart() {
+  echo "restarting"
+  docker-compose -f docker-compose-dev.yml restart relayer
+  docker-compose -f docker-compose-dev.yml restart backend
+}
+
+# if no arguments supplied, display usage
+if [  $# -le 0 ]
+then
+		usage
+		exit 1
+fi
+
+build=
+DOCKER_IMAGE=
+
+while [ "$1" != "" ]; do
+    case $1 in
+        -i | --image )          shift
+                                DOCKER_IMAGE=$1
+                                ;;
+        -b | --build )          build=1
+                                ;;
+        --restart )             restart
+                                exit
+                                ;;
+        --local )               jar=1
+                                ;;
+        --git )                 git=$1
+                                ;;
+        --seed )                echo "$1" > .seed
+                                ;;
+        -h | --help )           usage
+                                exit
+                                ;;
+        * )                     usage
+                                exit 1
+    esac
+    shift
+done
+
+if [ "$jar" = "1" ]; then
+    echo "Building jar only, skipping tests"
+    mvn jar:jar -Dmaven.test.skip=true
+    run
+fi
+
+if [ $DOCKER_IMAGE = "" ]
+then
+    usage
+    exit 1
+fi
+
+export DOCKER_IMAGE=$DOCKER_IMAGE
+
+if [ "$build" = "1" ]; then
+    echo "building $DOCKER_IMAGE"
+    docker build -t $DOCKER_IMAGE ../
+fi
+
+if [ "$git" != "" ]; then
+   echo "building from github: $git"
+   docker build -t $DOCKER_IMAGE $git
+fi
+
+run

pom.xml

@@ -7,7 +7,7 @@
     <artifactId>pendulum</artifactId>
 
 
-    <version>1.0.5</version>
+    <version>1.0.6</version>
 
 
     <name>Pendulum</name>