From fda573b8a76495c9c16b6859663e4abc9784df55 Mon Sep 17 00:00:00 2001
From: "alexey.stratulat" <alexey.stratulat@demlabs.net>
Date: Mon, 12 Jun 2023 06:16:00 +0000
Subject: [PATCH] Hotfix 8930_8918
---
dap-sdk | 2 +-
.../service/stake/dap_chain_net_srv_stake_pos_delegate.c | 6 +++---
modules/type/blocks/dap_chain_cs_blocks.c | 7 ++-----
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/dap-sdk b/dap-sdk
index a70e9212ad..5d72eeb03c 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit a70e9212ad7f25ec8f1737c87fab6eaabc35c0c7
+Subproject commit 5d72eeb03ce68cfc6e7e75b91f9f44da170c66e2
diff --git a/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c b/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c
index f94e497aa4..4f2784ae6c 100644
--- a/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c
+++ b/modules/service/stake/dap_chain_net_srv_stake_pos_delegate.c
@@ -626,7 +626,7 @@ static dap_chain_datum_tx_t *s_stake_tx_invalidate(dap_chain_net_t *a_net, dap_h
dap_chain_addr_t l_wallet_addr;
dap_chain_addr_fill_from_key(&l_wallet_addr, a_key, a_net->pub.id);
if (!dap_chain_addr_compare(&l_owner_addr, &l_wallet_addr)) {
- log_it(L_WARNING, "Try to invalidate delegating tx with not a owner wallet");
+ log_it(L_WARNING, "Trying to invalidate delegating tx with not a owner wallet");
return NULL;
}
const char *l_native_ticker = a_net->pub.native_ticker;
@@ -1759,9 +1759,9 @@ static int s_cli_srv_stake(int a_argc, char **a_argv, char **a_str_reply)
DAP_DELETE(l_decree_hash_str);
DAP_DELETE(l_tx);
} else {
- char l_final_tx_hash_str[DAP_CHAIN_HASH_FAST_STR_SIZE];
- dap_chain_hash_fast_to_str(l_final_tx_hash, l_final_tx_hash_str, sizeof(l_final_tx_hash_str));
+ char *l_final_tx_hash_str = dap_chain_hash_fast_to_str_new(l_final_tx_hash);
dap_cli_server_cmd_set_reply_text(a_str_reply, "Can't invalidate transaction %s, examine log files for details", l_final_tx_hash_str);
+ DAP_DELETE(l_final_tx_hash_str);
DAP_DELETE(l_tx);
return -21;
}
diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c
index 84886ef743..c3202735ca 100644
--- a/modules/type/blocks/dap_chain_cs_blocks.c
+++ b/modules/type/blocks/dap_chain_cs_blocks.c
@@ -568,16 +568,13 @@ static int s_cli_blocks(int a_argc, char ** a_argv, char **a_str_reply)
for (uint32_t i=0; i < l_block_cache->sign_count ; i++) {
dap_sign_t * l_sign = dap_chain_block_sign_get(l_block_cache->block, l_block_cache->block_size, i);
size_t l_sign_size = dap_sign_get_size(l_sign);
- dap_chain_addr_t l_addr = {0};
dap_chain_hash_fast_t l_pkey_hash;
dap_sign_get_pkey_hash(l_sign, &l_pkey_hash);
- dap_chain_addr_fill(&l_addr, l_sign->header.type, &l_pkey_hash, l_net->pub.id);
char l_pkey_hash_str[DAP_CHAIN_HASH_FAST_STR_SIZE];
dap_chain_hash_fast_to_str(&l_pkey_hash, l_pkey_hash_str, sizeof(l_pkey_hash_str));
- char *l_addr_str = dap_chain_addr_to_str(&l_addr);
dap_string_append_printf(l_str_tmp,"\t\t\ttype:%s size: %zd pkey_hash: %s \n"
- "\t\t\t\taddr: %s \n", dap_sign_type_to_str( l_sign->header.type ),
- l_sign_size, l_pkey_hash_str, l_addr_str );
+ "\t\t\t\n", dap_sign_type_to_str( l_sign->header.type ),
+ l_sign_size, l_pkey_hash_str );
}
dap_cli_server_cmd_set_reply_text(a_str_reply, "%s", l_str_tmp->str);
dap_string_free(l_str_tmp, true);
--
GitLab