CMakeLists.txt

@@ -13,7 +13,6 @@ if(WIN32)
   include_directories(../3rdparty/wepoll/include/)
   include_directories(../3rdparty/uthash/src/)
   include_directories(../3rdparty/libjson-c/)
-  include_directories(../3rdparty/libmagic/src/)
   include_directories(../3rdparty/curl/include/)
   include_directories(../3rdparty/libsqlite3/)
 endif()

client_mempool.c

@@ -145,8 +145,7 @@ int client_mempool_init(void)
         return -1;
     }
     else { */
-    const char *port_str = dap_config_get_item_str(g_config, "server", "listen_port_tcp");
-    listen_port_tcp = (port_str) ? atoi(port_str) : 8079;
+    listen_port_tcp = dap_config_get_item_int32_default(g_config, "server", "listen_port_tcp", 8079);
     /*}
     if(g_config)
         dap_config_close(g_config); */

dap_chain_mempool.c

@@ -103,7 +103,7 @@ int dap_chain_mempool_datum_add(dap_chain_datum_t * a_datum)
 int dap_chain_mempool_tx_create(dap_chain_t * a_chain, dap_enc_key_t *a_key_from,
         const dap_chain_addr_t* a_addr_from, const dap_chain_addr_t* a_addr_to,
         const dap_chain_addr_t* a_addr_fee,
-        const char a_token_ticker[10],
+        const char a_token_ticker[DAP_CHAIN_TICKER_SIZE_MAX],
         uint64_t a_value, uint64_t a_value_fee)
 {
     // check valid param
@@ -170,7 +170,7 @@ int dap_chain_mempool_tx_create(dap_chain_t * a_chain, dap_enc_key_t *a_key_from
     // add 'in' items
     {
         dap_list_t *l_list_tmp = l_list_used_out;
-        uint64_t l_value_to_items = 0; // how many coins to transfer
+        uint64_t l_value_to_items = 0; // how many datoshi to transfer
         while(l_list_tmp) {
             list_used_item_t *item = l_list_tmp->data;
             if(dap_chain_datum_tx_add_in_item(&l_tx, &item->tx_hash_fast,(uint32_t) item->num_idx_out) == 1) {
@@ -183,7 +183,7 @@ int dap_chain_mempool_tx_create(dap_chain_t * a_chain, dap_enc_key_t *a_key_from
     }
     // add 'out' items
     {
-        uint64_t l_value_pack = 0; // how much coin add to 'out' items
+        uint64_t l_value_pack = 0; // how much datoshi add to 'out' items
         if(dap_chain_datum_tx_add_out_item(&l_tx, a_addr_to, a_value) == 1) {
             l_value_pack += a_value;
             // transaction fee
@@ -447,7 +447,7 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
 int dap_chain_mempool_tx_create_cond(dap_chain_t * a_chain,
         dap_enc_key_t *a_key_from, dap_enc_key_t *a_key_cond,
         const dap_chain_addr_t* a_addr_from, const dap_chain_addr_t* a_addr_cond,
-        const dap_chain_addr_t* a_addr_fee, const char a_token_ticker[10],
+        const dap_chain_addr_t* a_addr_fee, const char a_token_ticker[DAP_CHAIN_TICKER_SIZE_MAX],
         uint64_t a_value, uint64_t a_value_fee, const void *a_cond, size_t a_cond_size)
 {
     // check valid param
@@ -580,7 +580,7 @@ int dap_chain_mempool_tx_create_cond(dap_chain_t * a_chain,
 int dap_chain_mempool_tx_create_receipt(uint64_t a_value)
 //(dap_enc_key_t *a_key_from, dap_enc_key_t *a_key_cond,
 //        const dap_chain_addr_t* a_addr_from, const dap_chain_addr_t* a_addr_cond,
-//        const dap_chain_addr_t* a_addr_fee, const char a_token_ticker[10],
+//        const dap_chain_addr_t* a_addr_fee, const char a_token_ticker[DAP_CHAIN_TICKER_SIZE_MAX],
 //        uint64_t a_value, uint64_t a_value_fee, const void *a_cond, size_t a_cond_size)
 {
     // check valid param

dap_chain_mempool.h

@@ -45,19 +45,19 @@ void dap_chain_mempool_add_proc(dap_http_t * a_http_server, const char * a_url);
 int dap_chain_mempool_tx_create(dap_chain_t * a_chain, dap_enc_key_t *a_key_from,
         const dap_chain_addr_t* a_addr_from, const dap_chain_addr_t* a_addr_to,
         const dap_chain_addr_t* a_addr_fee,
-        const char a_token_ticker[10],
+        const char a_token_ticker[DAP_CHAIN_TICKER_SIZE_MAX],
         uint64_t a_value, uint64_t a_value_fee);
 
 // Make transfer transaction & insert to cache
 int dap_chain_mempool_tx_create_cond(dap_chain_t * a_chain,
         dap_enc_key_t *a_key_from, dap_enc_key_t *a_key_cond,
         const dap_chain_addr_t* a_addr_from, const dap_chain_addr_t* a_addr_cond,
-        const dap_chain_addr_t* a_addr_fee, const char a_token_ticker[10],
+        const dap_chain_addr_t* a_addr_fee, const char a_token_ticker[DAP_CHAIN_TICKER_SIZE_MAX],
         uint64_t a_value, uint64_t a_value_fee, const void *a_cond, size_t a_cond_size);
 
 int dap_chain_mempool_datum_add(dap_chain_datum_t * a_datum);
 int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a_key_from,
         const dap_chain_addr_t* a_addr_from, const dap_chain_addr_t* a_addr_to,
         const dap_chain_addr_t* a_addr_fee,
-        const char a_token_ticker[10],
+        const char a_token_ticker[DAP_CHAIN_TICKER_SIZE_MAX],
         uint64_t a_value, uint64_t a_value_fee,size_t a_tx_num);