Merge branch 'develop'

Author: ender503

.travis.yml

@@ -1,3 +1,5 @@
+dist: bionic
+
 env:
   global:
    # The next declaration is the encrypted COVERITY_SCAN_TOKEN, created
@@ -14,6 +16,15 @@ before_install:
   - 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
+  # Install UUID library
+  - sudo apt install uuid-dev
+  # Install Cassandra C client library
+  - wget https://downloads.datastax.com/cpp-driver/ubuntu/18.04/dependencies/libuv/v1.35.0/libuv1_1.35.0-1_amd64.deb
+  - sudo dpkg -i libuv1_1.35.0-1_amd64.deb
+  - wget https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.15.1/cassandra-cpp-driver_2.15.1-1_amd64.deb
+  - sudo dpkg -i cassandra-cpp-driver_2.15.1-1_amd64.deb
+  - wget https://downloads.datastax.com/cpp-driver/ubuntu/18.04/cassandra/v2.15.1/cassandra-cpp-driver-dev_2.15.1-1_amd64.deb
+  - sudo dpkg -i cassandra-cpp-driver-dev_2.15.1-1_amd64.deb
 
 addons:
   coverity_scan:
@@ -25,4 +36,4 @@ addons:
     build_command: "bash tests/coverity_analysis.sh"
     branch_pattern: develop
 
-script: if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then make ; fi
+script: if [ "${COVERITY_SCAN_BRANCH}" != 1 ]; then bash -e tests/coverity_analysis.sh; fi

Makefile

@@ -1,12 +1,12 @@
 DCURL_DIR := third_party/dcurl
 DCURL_LIB := $(DCURL_DIR)/build/libdcurl.so
-MOSQITTO_DIR := third_party/mosquitto
-MOSQITTO_LIB := $(MOSQITTO_DIR)/lib/libmosquitto.so.1
+MOSQUITTO_DIR := third_party/mosquitto
+MOSQUITTO_LIB := $(MOSQUITTO_DIR)/lib/libmosquitto.so.1
 DEPS += $(DCURL_LIB)
 
 all: $(DEPS)
 
-.PHONY: $(DCURL_LIB) $(MOSQITTO_LIB)
+.PHONY: $(DCURL_LIB) $(MOSQUITTO_LIB)
 
 $(DCURL_LIB): $(DCURL_DIR)
 	git submodule update --init $^
@@ -15,15 +15,15 @@ $(DCURL_LIB): $(DCURL_DIR)
 	$(info Modify $^/build/local.mk for your environments.)
 	$(MAKE) -C $^ all
 
-MQTT: $(DCURL_LIB) $(MOSQITTO_LIB)
-$(MOSQITTO_LIB): $(MOSQITTO_DIR)
+MQTT: $(DCURL_LIB) $(MOSQUITTO_LIB)
+$(MOSQUITTO_LIB): $(MOSQUITTO_DIR)
 	git submodule update --init $^
 	@echo
 	$(MAKE) -C $^ WITH_DOCS=no
 
 clean:
 	$(MAKE) -C $(DCURL_DIR) clean
-	$(MAKE) -C $(MOSQITTO_DIR) clean
+	$(MAKE) -C $(MOSQUITTO_DIR) clean
 
 distclean: clean
 	$(RM) -r $(DCURL_DIR)

WORKSPACE

@@ -31,7 +31,6 @@ load("@io_bazel_rules_docker//repositories:repositories.bzl", container_reposito
 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(

accelerator/cli_info.h

@@ -10,6 +10,7 @@
 #define ACCELERATOR_CLI_INFO_H_
 
 #include <stdio.h>
+#include "common/macros.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -50,6 +51,7 @@ typedef enum ta_cli_arg_value_e {
   CONF_CLI,
   PROXY_API,
   HEALTH_TRACK_PERIOD,
+  NO_GTTA,
 
   /** LOGGER */
   QUIET,
@@ -83,10 +85,11 @@ static struct ta_cli_argument_s {
     {"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"},
+    {"no-gtta", no_argument, NULL, NO_GTTA, "Disable getTransactionToConfirm (gTTA) when sending transacation"},
     {"quiet", no_argument, NULL, QUIET, "Disable logger"},
     {NULL, 0, NULL, 0, NULL}};
 
-static const int cli_cmd_num = sizeof(ta_cli_arguments_g) / sizeof(struct ta_cli_argument_s);
+static const int cli_cmd_num = ARRAY_SIZE(ta_cli_arguments_g);
 
 static inline void ta_usage() {
   printf("tangle-accelerator usage:\n");

accelerator/config.c

@@ -38,7 +38,7 @@ static int get_conf_key(char const* const key) {
 }
 
 status_t cli_core_set(ta_core_t* const core, int key, char* const value) {
-  if (value == NULL && (key != CACHE && key != PROXY_API && key != QUIET)) {
+  if (value == NULL && (key != CACHE && key != PROXY_API && key != QUIET && key != NO_GTTA)) {
     ta_log_error("%s\n", "SC_CONF_NULL");
     return SC_CONF_NULL;
   }
@@ -186,10 +186,12 @@ status_t cli_core_set(ta_core_t* const core, int key, char* const value) {
     case QUIET:
       quiet_mode = true;
       break;
-
     case PROXY_API:
       ta_conf->proxy_passthrough = true;
       break;
+    case NO_GTTA:
+      ta_conf->gtta = false;
+      break;
 
     // File configuration
     case CONF_CLI: {
@@ -225,6 +227,7 @@ status_t ta_core_default_init(ta_core_t* const core) {
   ta_conf->thread_count = TA_THREAD_COUNT;
   ta_conf->proxy_passthrough = false;
   ta_conf->health_track_period = IRI_HEALTH_TRACK_PERIOD;
+  ta_conf->gtta = true;
 #ifdef MQTT_ENABLE
   ta_conf->mqtt_host = MQTT_HOST;
   ta_conf->mqtt_topic_root = TOPIC_ROOT;

accelerator/config.h

@@ -33,7 +33,7 @@ extern "C" {
  * @brief Configuration of tangle-accelerator
  */
 
-#define TA_VERSION "tangle-accelerator/0.9.1"
+#define TA_VERSION "tangle-accelerator/0.9.2"
 #define TA_HOST "localhost"
 
 #ifdef MQTT_ENABLE
@@ -68,29 +68,29 @@ typedef struct ta_config_s {
   int port;                               /**< Binding port of tangle-accelerator */
   char* host_list[MAX_IRI_LIST_ELEMENTS]; /**< List of binding host of tangle-accelerator */
   int port_list[MAX_IRI_LIST_ELEMENTS];   /**< List of binding port of tangle-accelerator */
-  uint8_t thread_count;                   /**< Thread count of tangle-accelerator instance */
+  int health_track_period;                /**< The period for checking IRI host connection status */
 #ifdef MQTT_ENABLE
   char* mqtt_host;       /**< Address of MQTT broker host */
   char* mqtt_topic_root; /**< The topic root of MQTT topic */
 #endif
-  bool proxy_passthrough;  /**< Pass proxy api directly without processing */
-  int health_track_period; /**< The period for checking IRI host connection status */
+  uint8_t thread_count;   /**< Thread count of tangle-accelerator instance */
+  bool proxy_passthrough; /**< Pass proxy api directly without processing */
+  bool gtta;              /**< The option to turn on or off GTTA. The default value is true which enabling GTTA */
 } ta_config_t;
 
 /** struct type of iota configuration */
 typedef struct iota_config_s {
-  uint8_t milestone_depth; /**< Depth of API argument */
-  uint8_t mwm;             /**< Minimum weight magnitude of API argument */
-  /** Seed to generate address. This does not do any signature yet. */
-  const char* seed;
+  uint8_t milestone_depth;   /**< Depth of API argument */
+  uint8_t mwm;               /**< Minimum weight magnitude of API argument */
+  const char* seed;          /**< Seed to generate address. This does not do any signature yet. */
   const char* mam_file_path; /**< The MAM file which records the mam config */
 } iota_config_t;
 
 /** struct type of accelerator cache */
 typedef struct ta_cache_s {
-  bool cache_state; /** set it true to turn on cache server */
   char* host;       /**< Binding address of redis server */
   uint16_t port;    /**< Binding port of redis server */
+  bool cache_state; /**< Set it true to turn on cache server */
 } ta_cache_t;
 
 /** struct type of accelerator core */

accelerator/core/apis.c

@@ -401,8 +401,9 @@ status_t api_recv_mam_message(const iota_config_t* const iconf, const iota_clien
   return ret;
 }
 
-status_t api_mam_send_message(const iota_config_t* const iconf, const iota_client_service_t* const service,
-                              char const* const payload, char** json_result) {
+status_t api_mam_send_message(const ta_config_t* const info, const iota_config_t* const iconf,
+                              const iota_client_service_t* const service, char const* const payload,
+                              char** json_result) {
   status_t ret = SC_OK;
   mam_api_t mam;
   tryte_t chid[MAM_CHANNEL_ID_TRYTE_SIZE] = {}, epid[MAM_CHANNEL_ID_TRYTE_SIZE] = {},
@@ -445,7 +446,7 @@ status_t api_mam_send_message(const iota_config_t* const iconf, const iota_clien
 
   // Sending bundle
   lock_handle_lock(&cjson_lock);
-  if (ta_send_bundle(iconf, service, bundle) != SC_OK) {
+  if (ta_send_bundle(info, iconf, service, bundle) != SC_OK) {
     lock_handle_unlock(&cjson_lock);
     ret = SC_MAM_FAILED_RESPONSE;
     ta_log_error("%s\n", "SC_MAM_FAILED_RESPONSE");
@@ -488,7 +489,7 @@ status_t api_mam_send_message(const iota_config_t* const iconf, const iota_clien
     }
 
     lock_handle_lock(&cjson_lock);
-    if (ta_send_bundle(iconf, service, bundle) != SC_OK) {
+    if (ta_send_bundle(info, iconf, service, bundle) != SC_OK) {
       lock_handle_unlock(&cjson_lock);
       ret = SC_MAM_FAILED_RESPONSE;
       ta_log_error("%s\n", "SC_MAM_FAILED_RESPONSE");
@@ -557,7 +558,7 @@ status_t api_send_transfer(const ta_core_t* const core, const char* const obj, c
     goto done;
   }
 
-  ret = ta_send_transfer(&core->iota_conf, &core->iota_service, req, res);
+  ret = ta_send_transfer(&core->ta_conf, &core->iota_conf, &core->iota_service, req, res);
   if (ret == SC_CCLIENT_FAILED_RESPONSE) {
     lock_handle_unlock(&cjson_lock);
     ta_log_info("%s\n", "Caching transaction");
@@ -624,8 +625,8 @@ status_t api_send_transfer(const ta_core_t* const core, const char* const obj, c
   return ret;
 }
 
-status_t api_send_trytes(const iota_config_t* const iconf, const iota_client_service_t* const service,
-                         const char* const obj, char** json_result) {
+status_t api_send_trytes(const ta_config_t* const info, const iota_config_t* const iconf,
+                         const iota_client_service_t* const service, const char* const obj, char** json_result) {
   status_t ret = SC_OK;
   hash8019_array_p trytes = hash8019_array_new();
 
@@ -642,7 +643,7 @@ status_t api_send_trytes(const iota_config_t* const iconf, const iota_client_ser
     goto done;
   }
 
-  ret = ta_send_trytes(iconf, service, trytes);
+  ret = ta_send_trytes(info, iconf, service, trytes);
   if (ret != SC_OK) {
     lock_handle_unlock(&cjson_lock);
     goto done;

accelerator/core/apis.h

@@ -153,6 +153,7 @@ status_t api_recv_mam_message(const iota_config_t* const iconf, const iota_clien
  * There is no need to decode the ascii payload to tryte, since the
  * api_mam_send_message() will take this job.
  *
+ * @param[in] info Tangle-accelerator configuration variables
  * @param[in] iconf IOTA API parameter configurations
  * @param[in] service IRI node end point service
  * @param[in] payload message to send undecoded ascii string.
@@ -162,8 +163,9 @@ status_t api_recv_mam_message(const iota_config_t* const iconf, const iota_clien
  * - SC_OK on success
  * - non-zero on error
  */
-status_t api_mam_send_message(const iota_config_t* const iconf, const iota_client_service_t* const service,
-                              char const* const payload, char** json_result);
+status_t api_mam_send_message(const ta_config_t* const info, const iota_config_t* const iconf,
+                              const iota_client_service_t* const service, char const* const payload,
+                              char** json_result);
 
 /**
  * @brief Send transfer to tangle.
@@ -259,6 +261,7 @@ status_t api_find_transactions_obj_by_tag(const iota_client_service_t* const ser
  * This allows for reattachments and prevents key reuse if trytes can't
  * be recovered by querying the network after broadcasting.
  *
+ * @param[in] info Tangle-accelerator configuration variables
  * @param[in] iconf IOTA API parameter configurations
  * @param[in] service IRI node end point service
  * @param[in] obj trytes to attach, store and broadcast in json array
@@ -269,8 +272,8 @@ status_t api_find_transactions_obj_by_tag(const iota_client_service_t* const ser
  * - SC_OK on success
  * - non-zero on error
  */
-status_t api_send_trytes(const iota_config_t* const iconf, const iota_client_service_t* const service,
-                         const char* const obj, char** json_result);
+status_t api_send_trytes(const ta_config_t* const info, const iota_config_t* const iconf,
+                         const iota_client_service_t* const service, const char* const obj, char** json_result);
 
 /**
  * @brief Check the connection status between tangle-accelerator and IRI host.

accelerator/core/core.c

@@ -65,8 +65,8 @@ status_t ta_attach_to_tangle(const attach_to_tangle_req_t* const req, attach_to_
   return ret;
 }
 
-status_t ta_send_trytes(const iota_config_t* const iconf, const iota_client_service_t* const service,
-                        hash8019_array_p trytes) {
+status_t ta_send_trytes(const ta_config_t* const info, const iota_config_t* const iconf,
+                        const iota_client_service_t* const service, hash8019_array_p trytes) {
   status_t ret = SC_OK;
   get_transactions_to_approve_req_t* tx_approve_req = get_transactions_to_approve_req_new();
   get_transactions_to_approve_res_t* tx_approve_res = get_transactions_to_approve_res_new();
@@ -77,12 +77,13 @@ status_t ta_send_trytes(const iota_config_t* const iconf, const iota_client_serv
     ta_log_error("%s\n", "SC_CCLIENT_OOM");
     goto done;
   }
-
-  get_transactions_to_approve_req_set_depth(tx_approve_req, iconf->milestone_depth);
-  if (iota_client_get_transactions_to_approve(service, tx_approve_req, tx_approve_res)) {
-    ret = SC_CCLIENT_FAILED_RESPONSE;
-    ta_log_error("%s\n", "SC_CCLIENT_FAILED_RESPONSE");
-    goto done;
+  if (info->gtta) {
+    get_transactions_to_approve_req_set_depth(tx_approve_req, iconf->milestone_depth);
+    if (iota_client_get_transactions_to_approve(service, tx_approve_req, tx_approve_res)) {
+      ret = SC_CCLIENT_FAILED_RESPONSE;
+      ta_log_error("%s\n", "SC_CCLIENT_FAILED_RESPONSE");
+      goto done;
+    }
   }
 
   // copy trytes to attach_req->trytes
@@ -161,8 +162,9 @@ status_t ta_generate_address(const iota_config_t* const iconf, const iota_client
   return (status_t)rval;
 }
 
-status_t ta_send_transfer(const iota_config_t* const iconf, const iota_client_service_t* const service,
-                          const ta_send_transfer_req_t* const req, ta_send_transfer_res_t* res) {
+status_t ta_send_transfer(const ta_config_t* const info, const iota_config_t* const iconf,
+                          const iota_client_service_t* const service, const ta_send_transfer_req_t* const req,
+                          ta_send_transfer_res_t* res) {
   if (req == NULL || res == NULL) {
     ta_log_error("%s\n", "SC_TA_NULL");
     return SC_TA_NULL;
@@ -221,7 +223,7 @@ status_t ta_send_transfer(const iota_config_t* const iconf, const iota_client_se
     free(serialized_txn);
   }
 
-  ret = ta_send_trytes(iconf, service, raw_tx);
+  ret = ta_send_trytes(info, iconf, service, raw_tx);
   if (ret) {
     goto done;
   }
@@ -435,8 +437,8 @@ status_t ta_get_bundle(const iota_client_service_t* const service, tryte_t const
   return ret;
 }
 
-status_t ta_send_bundle(const iota_config_t* const iconf, const iota_client_service_t* const service,
-                        bundle_transactions_t* const bundle) {
+status_t ta_send_bundle(const ta_config_t* const info, const iota_config_t* const iconf,
+                        const iota_client_service_t* const service, bundle_transactions_t* const bundle) {
   Kerl kerl;
   kerl_init(&kerl);
   bundle_finalize(bundle, &kerl);
@@ -450,7 +452,7 @@ status_t ta_send_bundle(const iota_config_t* const iconf, const iota_client_serv
     hash_array_push(raw_trytes, trits_8019);
   }
 
-  ta_send_trytes(iconf, service, raw_trytes);
+  ta_send_trytes(info, iconf, service, raw_trytes);
 
   hash_array_free(raw_trytes);
   transaction_array_free(out_tx_objs);