From 83e0ded039241285765944a5b9ca39dccaf3f2a9 Mon Sep 17 00:00:00 2001
From: "roman.khlopkov" <roman.khlopkov@demlabs.net>
Date: Thu, 18 Jan 2024 15:10:31 +0300
Subject: [PATCH] [*] Order node addr fix
---
modules/mempool/dap_chain_mempool.c | 2 +-
.../service/stake/dap_chain_net_srv_stake_pos_delegate.c | 6 +++---
modules/type/blocks/dap_chain_cs_blocks.c | 7 ++++---
modules/type/dag/dap_chain_cs_dag.c | 2 +-
4 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/modules/mempool/dap_chain_mempool.c b/modules/mempool/dap_chain_mempool.c
index 8c2c63e492..57688fda66 100644
--- a/modules/mempool/dap_chain_mempool.c
+++ b/modules/mempool/dap_chain_mempool.c
@@ -560,7 +560,7 @@ int dap_chain_mempool_tx_create_massive( dap_chain_t * a_chain, dap_enc_key_t *a
const char a_token_ticker[10], uint256_t a_value, uint256_t a_value_fee,
size_t a_tx_num)
{
- // check valid paramdap_chain_mempool_tx_coll_fee_create
+ // check valid param
if(!a_chain | !a_key_from || !a_addr_from || !a_key_from->priv_key_data || !a_key_from->priv_key_data_size ||
dap_chain_addr_check_sum(a_addr_from) || dap_chain_addr_check_sum(a_addr_to) ||
IS_ZERO_256(a_value) || !a_tx_num){
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 e321783209..1922575a47 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
@@ -1125,7 +1125,7 @@ struct validator_odrer_ext {
} DAP_ALIGN_PACKED;
char *s_validator_order_create(dap_chain_net_t *a_net, uint256_t a_value_min, uint256_t a_value_max, uint256_t a_tax,
- dap_enc_key_t *a_key, const char *a_hash_out_type)
+ dap_enc_key_t *a_key, const char *a_hash_out_type, dap_chain_node_addr_t a_node_addr)
{
dap_chain_hash_fast_t l_tx_hash = {};
dap_chain_net_srv_order_direction_t l_dir = SERV_DIR_SELL;
@@ -1134,7 +1134,7 @@ char *s_validator_order_create(dap_chain_net_t *a_net, uint256_t a_value_min, ui
dap_chain_net_srv_price_unit_uid_t l_unit = { .uint32 = SERV_UNIT_PCS};
dap_chain_net_srv_uid_t l_uid = { .uint64 = DAP_CHAIN_NET_SRV_STAKE_POS_DELEGATE_ORDERS };
struct validator_odrer_ext l_order_ext = { a_tax, a_value_max };
- dap_chain_net_srv_order_t *l_order = dap_chain_net_srv_order_compose(a_net, l_dir, l_uid, g_node_addr,
+ dap_chain_net_srv_order_t *l_order = dap_chain_net_srv_order_compose(a_net, l_dir, l_uid, a_node_addr,
l_tx_hash, &a_value_min, l_unit, l_delegated_ticker, 0,
(const uint8_t *)&l_order_ext, sizeof(l_order_ext),
1, NULL, 0, a_key);
@@ -1305,7 +1305,7 @@ static int s_cli_srv_stake_order(int a_argc, char **a_argv, int a_arg_index, voi
return l_result;
}
// Create the order & put it in GDB
- char *l_order_hash_str = s_validator_order_create(l_net, l_value_min, l_value_max, l_tax, l_cert->enc_key, a_hash_out_type);
+ char *l_order_hash_str = s_validator_order_create(l_net, l_value_min, l_value_max, l_tax, l_cert->enc_key, a_hash_out_type, l_node_addr);
if (l_order_hash_str) {
dap_cli_server_cmd_set_reply_text(a_str_reply, "Successfully created order %s", l_order_hash_str);
DAP_DELETE(l_order_hash_str);
diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c
index 1f92ab77d0..4e3030ea49 100644
--- a/modules/type/blocks/dap_chain_cs_blocks.c
+++ b/modules/type/blocks/dap_chain_cs_blocks.c
@@ -203,7 +203,9 @@ int dap_chain_cs_blocks_init()
"\t\t Take delegated part of reward\n\n"
"Rewards and comission autocollect status:\n"
- "block -net <net_name> -chain <chain_name> autocollect status\n\n"
+ "block -net <net_name> -chain <chain_name> autocollect status\n"
+ "\t\t Show rewards and fees automatic collecting status (enabled or not)."
+ " Show prepared blocks for collecting rewards and fees if status is enabled\n"
);
if( dap_chain_block_cache_init() ) {
log_it(L_WARNING, "Can't init blocks cache");
@@ -864,8 +866,7 @@ static int s_cli_blocks(int a_argc, char ** a_argv, void **a_str_reply)
if (!l_found)
continue;
}
- }
- if (l_signed_flag) {
+ } else if (l_signed_flag) {
if (l_unspent_flag && l_ts < DAP_REWARD_INIT_TIMESTAMP)
continue;
if (!l_pub_key) {
diff --git a/modules/type/dag/dap_chain_cs_dag.c b/modules/type/dag/dap_chain_cs_dag.c
index 112828434c..6bb75e5b6f 100644
--- a/modules/type/dag/dap_chain_cs_dag.c
+++ b/modules/type/dag/dap_chain_cs_dag.c
@@ -664,7 +664,7 @@ static bool s_chain_callback_datums_pool_proc(dap_chain_t *a_chain, dap_chain_da
size_t l_hashes_size = l_dag->is_single_line ? 1 : l_dag->datum_add_hashes_count,
l_hashes_linked = 0;
- dap_chain_hash_fast_t *l_hashes = l_hashes_size && !s_seed_mode
+ dap_chain_hash_fast_t *l_hashes = l_hashes_size
? DAP_NEW_STACK_SIZE(dap_chain_hash_fast_t, l_hashes_size * sizeof(dap_chain_hash_fast_t))
: NULL;
--
GitLab