Merge branch 'pre-releasev0.9.1'

Author: ender503

.travis.yml

@@ -0,0 +1,28 @@
+env:
+  global:
+   # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
+   #   via the "travis encrypt" command using the project repo's public key
+    - secure: "UzFj98mHlWrUob3k8s+T3AyPY3V/M5PIMyTzdNpLokby6YOl7BAb0ubeHkz3JxfYiEvGt1TB5zD/8LA8hBH0pn/EccrgNX/BYLW+ZUBA3rbBahJvpcTlGqKifKbWYEcPXSrW+naAEU5HFIfYayhyGLg1weucY2lsoM7yo8NlE2kYPu9+XXbltHpRYa2Nfw0bTHRs0RRVSs5kvtLIVyq/f2Mv/CdBbJJRaiTlzVUilQvejM9bdu/sLOvDdxucv6wMvPdzJL2LtXW6BSjjkE9lgQg58OT2AxErBENMElZMMG3lO2KgHozTJ+IOjJ+/CzkyUHfLjAD7aKxRN4cygV/DXcoZ/+ppw5MqDLA7eIVzX0xAjy6S93QPrfpiB4rkohls8NCAd4No6o0vFgCvFfPxcbYpa7eLEyrMpbHnUwBkGXcHUHyGg/v5WQUCthHGUTJ0A0SIPn7z5WEaNTv15IusSVSxYZhLu0PqWosABslDnaMVrOZkgkaNMty3ZFBpNBWHtlH9XjybBe4V28/E4g5xOrwkDm9KLiFQi+vjdPx2i0vOCgRHseG5DCRUBjyfgktOOP3DhOvbe48CxAyRm2qT1T/xeT9qK420k9fryjzdMV/4L86Fid4oBqAGd+ScjODhgIS3tAQRpdpOzFZWitwWxZUEGC4AjqrwTwIsyiBopuI="
+
+language: c
+
+before_install:
+  - echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
+  # Add Bazel distribution URI as a package source
+  - sudo apt install curl
+  - curl https://bazel.build/bazel-release.pub.gpg | sudo apt-key add -
+  - echo "deb [arch=amd64] https://storage.googleapis.com/bazel-apt stable jdk1.8" | sudo tee /etc/apt/sources.list.d/bazel.list
+  # Install and update Bazel
+  - sudo apt update && sudo apt install bazel
+
+addons:
+  coverity_scan:
+    project:
+      name: "DLTcollab/tangle-accelerator"
+      description: "Accelerate IOTA transactions by caching API requests and redirecting to faster alternatives"
+    notification_email: [email protected]
+    build_command_prepend: ""
+    build_command: "bash tests/coverity_analysis.sh"
+    branch_pattern: develop
+
+script: if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make ; fi

README.md

@@ -12,7 +12,7 @@ Being at the edge as a key-value store, an edge-caching node powered by `Tangle-
 does not have to communicate to typical [IOTA](https://www.iota.org/) full nodes for every API
 calls. Instead, the cached transaction data being sought is available as needed.
 
-As an intermediate server accelerateing interactions with the Tangle, it faciliates
+As an intermediate server accelerating interactions with the Tangle, it facilitates
 [dcurl](https://github.com/DLTcollab/dcurl) to perform hardware-accelerated PoW operations
 on edge devices. In the meanwhile, `Tangle-accelerator` provides shortcuts for certain
 use scenarios such as MAM and [TangleID](https://tangleid.github.io/).
@@ -52,7 +52,7 @@ both footprint and startup time are behaved pretty well.
 
 `Tangle-accelerator` helps to reattach pending transactions were attached from `Tangle-accelerator`.
 Reattachment increases chances of confirmation and prevents messages being pruned when full nodes perform snapshot.
-Clients should provide a uniqle ID as the identifier to each message and it's corresponding transaction hash since a new transaction hash will be generated after reattachement. 
+Clients should provide a unique ID as the identifier to each message and it's corresponding transaction hash since a new transaction hash will be generated after reattachment. 
 
 `Tangle-accelerator` uses ScyllaDB to store each transaction's ID, hash and status(Pending or confirmed). `Tangle-accelerator` will periodically check the status of pending transactions and reattach transactions which have been pended too long. Confirmed transactions will be stored into permanodes.
 
@@ -86,6 +86,7 @@ Tangle-accelerator is built and launched through Bazel, it also requires Redis t
 * [Redis-server](https://redis.io/topics/quickstart)
 * cmake (required by dcurl)
 * openssl-dev (required by mosquitto)
+* uuid-dev
 
 ## Build from Source
 
@@ -107,7 +108,7 @@ Tangle-accelerator supports several different build time options.
 * MQTT connectivity
 * External database
 
-See [docs/build.md](https://github.com/DLTcollab/tangle-accelerator/docs/build.md) for more information.
+See [docs/build.md](docs/build.md) for more information.
 
 ## Developing
 
@@ -145,10 +146,10 @@ clang-format can be installed by command:
 
 ## Usage
 `Tangle-accelerator` currently supports two categories of APIs
-* direct API: check [wiki page](https://github.com/DLTcollab/tangle-accelerator/wiki) for details.
+* Direct API: check [wiki page](https://github.com/DLTcollab/tangle-accelerator/wiki) for details.
 * Proxy API to IRI core functionalities
 
-### IRI Porxy API
+### IRI Proxy API
 `tangle-accelerator` allows the use of IRI core APIs. The calling process does not have to be aware of the destination machine running IRI. With the exactly same format of IRI API, `tangle-accelerator` would help users forward the request to IRI and forward the response back to users.
 We support two way to forward Proxy APIs to IRI:
 1. Bypass Proxy APIs directly to IRI.

WORKSPACE

@@ -22,7 +22,7 @@ git_repository(
 git_repository(
     name = "io_bazel_rules_docker",
     remote = "https://github.com/bazelbuild/rules_docker.git",
-    tag = "v0.7.0",
+    tag = "v0.9.0",
 )
 
 load("@rules_iota//:defs.bzl", "iota_deps")
@@ -32,6 +32,15 @@ container_repositories()
 
 load("@io_bazel_rules_docker//cc:image.bzl", _cc_image_repos = "repositories")
 
+load("@io_bazel_rules_docker//container:pull.bzl", "container_pull")
+
+container_pull(
+    name = "ubuntu1804",
+    registry = "l.gcr.io",
+    repository = "google/ubuntu1804",
+    tag = "latest",
+)
+
 iota_deps()
 
 third_party_deps()

accelerator/BUILD

@@ -1,5 +1,7 @@
 load("@io_bazel_rules_docker//cc:image.bzl", "cc_image")
-load("@io_bazel_rules_docker//container:container.bzl", "container_push")
+load("@io_bazel_rules_docker//container:container.bzl", "container_image")
+load("@io_bazel_rules_docker//docker/package_managers:download_pkgs.bzl", "download_pkgs")
+load("@io_bazel_rules_docker//docker/package_managers:install_pkgs.bzl", "install_pkgs")
 
 cc_binary(
     name = "accelerator",
@@ -52,18 +54,33 @@ cc_library(
     srcs = ["cli_info.h"],
 )
 
+download_pkgs(
+    name = "docker_runtime_pkgs",
+    image_tar = "@ubuntu1804//image",
+    packages = [
+        "uuid-runtime",
+    ],
+)
+
+install_pkgs(
+    name = "docker_runtime_image",
+    image_tar = "@ubuntu1804//image",
+    installables_tar = ":docker_runtime_pkgs.tar",
+    installation_cleanup_commands = "rm -rf /var/lib/apt/lists/*",
+    output_image_name = "docker_runtime_image",
+)
+
 cc_image(
-    name = "docker",
+    name = "docker_base_image",
+    base = ":docker_runtime_image",
     binary = ":accelerator",
 )
 
-container_push(
-    name = "push_docker",
-    format = "Docker",
-    image = ":docker",
-    registry = "index.docker.io",
-    repository = "dltcollab/tangle-accelerator",
-    tag = "latest",
+container_image(
+    name = "docker_image",
+    base = ":docker_base_image",
+    repository = "dltcollab",
+    stamp = True,
 )
 
 cc_library(

accelerator/cli_info.h

@@ -29,6 +29,7 @@ typedef enum ta_cli_arg_value_e {
   /** IRI */
   IRI_HOST_CLI,
   IRI_PORT_CLI,
+  IRI_ADDRESS_CLI,
 
   /** MQTT */
   MQTT_HOST_CLI,
@@ -48,6 +49,7 @@ typedef enum ta_cli_arg_value_e {
   CACHE,
   CONF_CLI,
   PROXY_API,
+  HEALTH_TRACK_PERIOD,
 
   /** LOGGER */
   QUIET,
@@ -69,15 +71,18 @@ static struct ta_cli_argument_s {
     {"iri_port", required_argument, NULL, IRI_PORT_CLI, "IRI listening port"},
     {"mqtt_host", required_argument, NULL, MQTT_HOST_CLI, "MQTT listening host"},
     {"mqtt_root", required_argument, NULL, MQTT_ROOT_CLI, "MQTT listening topic root"},
+    {"iri_address", required_argument, NULL, IRI_ADDRESS_CLI, " List of IRI listening URL"},
     {"redis_host", required_argument, NULL, REDIS_HOST_CLI, "Redis server listening host"},
     {"redis_port", required_argument, NULL, REDIS_PORT_CLI, "Redis server listening port"},
     {"db_host", required_argument, NULL, DB_HOST_CLI, "DB server listening host"},
     {"milestone_depth", optional_argument, NULL, MILESTONE_DEPTH_CLI, "IRI milestone depth"},
     {"mwm", optional_argument, NULL, MWM_CLI, "minimum weight magnitude"},
     {"seed", optional_argument, NULL, SEED_CLI, "IOTA seed"},
-    {"cache", required_argument, NULL, CACHE, "Enable cache server with Y"},
+    {"cache", no_argument, NULL, CACHE, "Enable cache server"},
     {"config", required_argument, NULL, CONF_CLI, "Read configuration file"},
     {"proxy_passthrough", no_argument, NULL, PROXY_API, "Pass proxy API directly to IRI without processing"},
+    {"health_track_period", no_argument, NULL, HEALTH_TRACK_PERIOD,
+     "The period for checking IRI host connection status"},
     {"quiet", no_argument, NULL, QUIET, "Disable logger"},
     {NULL, 0, NULL, 0, NULL}};