From 38a52fedef0ec7e38b978321e271dd145e50b7d6 Mon Sep 17 00:00:00 2001
From: Dmitriy Gerasimov <naeper@demlabs.net>
Date: Wed, 5 Jun 2019 15:47:46 +0700
Subject: [PATCH] [*] Changed default wallet from tesla to bliss [*] Some fixes
in build rules
---
CMakeLists.txt | 2 +-
dap_chain_node_cli_cmd.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33f358ff7e..b33effb356 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ file(GLOB IPUTILS_SRCS iputils/*.c iputils/traceroute/*.c)
file(GLOB IPUTILS_HEADERS iputils/*.h ${IPUTILS_INCLUDE_DIRS}*.h)
add_library(${PROJECT_NAME} STATIC ${DAP_CHAIN_NET_SRCS} ${DAP_CHAIN_NET_HEADERS} ${IPUTILS_SRCS} ${IPUTILS_HEADERS})
-target_link_libraries(dap_chain_net dap_core dap_crypto dap_client dap_core_server dap_stream_ch_chain dap_stream_ch_chain_net dap_chain dap_chain_crypto dap_chain_wallet dap_chain_net_srv dap_chain_mempool dap_chain_global_db -lresolv)
+target_link_libraries(dap_chain_net dap_core dap_crypto dap_client dap_stream_ch_chain dap_stream_ch_chain_net dap_chain dap_chain_crypto dap_chain_wallet dap_chain_net_srv dap_chain_mempool dap_chain_global_db -lresolv)
target_include_directories(dap_chain_net INTERFACE . PUBLIC ${IPUTILS_INCLUDE_DIRS})
set(${PROJECT_NAME}_DEFINITIONS CACHE INTERNAL "${PROJECT_NAME}: Definitions" FORCE)
diff --git a/dap_chain_node_cli_cmd.c b/dap_chain_node_cli_cmd.c
index cf2e5961b1..4740646024 100644
--- a/dap_chain_node_cli_cmd.c
+++ b/dap_chain_node_cli_cmd.c
@@ -1190,7 +1190,7 @@ int com_tx_wallet(int argc, const char ** argv, char **str_reply)
"wallet name option <-w> not defined");
return -1;
}
- dap_chain_sign_type_t l_sign_type = { SIG_TYPE_TESLA };
+ dap_chain_sign_type_t l_sign_type = { SIG_TYPE_BLISS };
dap_chain_net_id_t l_net_id = { 0x1 };
// Creates new wallet
dap_chain_wallet_t *l_wallet = dap_chain_wallet_create(wallet_name, c_wallets_path, l_net_id, l_sign_type);
@@ -2175,7 +2175,7 @@ int com_tx_create(int argc, const char ** argv, char **str_reply)
return -1;
}
dap_chain_net_t * l_net = dap_chain_net_by_name(l_net_name);
- dap_ledger_t *l_ledger = l_net->pub.ledger ;
+ dap_ledger_t *l_ledger = l_net? l_net->pub.ledger : NULL ;
if((l_ledger = dap_chain_ledger_by_net_name(l_net_name)) == NULL) {
dap_chain_node_cli_set_reply_text(str_reply, "not found net by name '%s'", l_net_name);
return -1;
--
GitLab