From 8402b15d02031223c7c07b333f45071c4d9547f2 Mon Sep 17 00:00:00 2001
From: "roman.khlopkov" <roman.khlopkov@demlabs.net>
Date: Wed, 6 Dec 2023 13:33:11 +0300
Subject: [PATCH] [*] Build fix
---
modules/consensus/esbocs/dap_chain_cs_esbocs.c | 12 +-----------
modules/net/dap_chain_net_decree.c | 4 ++--
modules/type/blocks/dap_chain_cs_blocks.c | 2 +-
3 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
index 8f2c94e5f9..64f73b8486 100644
--- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c
+++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
@@ -297,17 +297,7 @@ lb_err:
return l_ret;
}
-typedef struct fee_serv_param
-{
- dap_hash_fast_t block_hash;
- dap_enc_key_t * key_from;
- dap_chain_addr_t * a_addr_to;
- uint256_t fee_need_cfg;
- uint256_t value_fee;
- dap_chain_t * chain;
-}fee_serv_param_t;
-
-static void s_check_db_collect_callback(dap_global_db_context_t UNUSED_ARG *a_global_db_context,
+static void s_check_db_collect_callback(dap_global_db_instance_t UNUSED_ARG *a_dbi,
int a_rc, const char *a_group, const char *a_key, const void *a_value,
const size_t a_value_size, dap_nanotime_t UNUSED_ARG a_value_ts,
bool UNUSED_ARG a_is_pinned, void *a_arg)
diff --git a/modules/net/dap_chain_net_decree.c b/modules/net/dap_chain_net_decree.c
index 0d795bd7ae..a6c105e3d5 100644
--- a/modules/net/dap_chain_net_decree.c
+++ b/modules/net/dap_chain_net_decree.c
@@ -484,7 +484,7 @@ static int s_common_decree_handler(dap_chain_datum_decree_t *a_decree, dap_chain
dap_enc_http_ban_list_client_add_ipv6(l_ip_addr, l_decree_hash, a_decree->header.ts_created);
} else if (l_tsd->type == DAP_CHAIN_DATUM_DECREE_TSD_TYPE_NODE_ADDR){
dap_chain_node_addr_t l_addr_node = dap_tsd_get_scalar(l_tsd, dap_chain_node_addr_t);
- if (!dap_chain_node_net_ban_list_add_node_addr(l_addr_node, l_decree_hash, a_decree->header.ts_created, l_net))
+ if (!dap_chain_node_net_ban_list_add_node_addr(l_addr_node, l_decree_hash, a_decree->header.ts_created, a_net))
return -4;
} else {
log_it(L_WARNING, "Invalid section TSD type for sub-decree datum of type "
@@ -515,7 +515,7 @@ static int s_common_decree_handler(dap_chain_datum_decree_t *a_decree, dap_chain
dap_enc_http_ban_list_client_remove_ipv6(l_ip_addr);
} else if (l_tsd->type == DAP_CHAIN_DATUM_DECREE_TSD_TYPE_NODE_ADDR){
dap_chain_node_addr_t l_addr_node = dap_tsd_get_scalar(l_tsd, dap_chain_node_addr_t);
- dap_chain_node_net_ban_list_remove_node_addr(l_net, l_addr_node);
+ dap_chain_node_net_ban_list_remove_node_addr(a_net, l_addr_node);
} else {
log_it(L_WARNING, "Invalid section TSD type for sub-decree datum of type "
"DAP_CHAIN_DATUM_DECREE_COMMON_SUBTYPE_UNBAN.");
diff --git a/modules/type/blocks/dap_chain_cs_blocks.c b/modules/type/blocks/dap_chain_cs_blocks.c
index 99a453e405..ec395057c0 100644
--- a/modules/type/blocks/dap_chain_cs_blocks.c
+++ b/modules/type/blocks/dap_chain_cs_blocks.c
@@ -1913,7 +1913,7 @@ static uint256_t s_callback_calc_reward(dap_chain_t *a_chain, dap_hash_fast_t *a
assert(!l_block_cache);
l_block = l_block_cache->block;
assert(l_block);
- dap_time_t l_time_diff = l_block_time - dap_max(l_block->hdr.ts_created, DAP_REWARD_INIT_TIMESTAMP);
+ dap_time_t l_time_diff = l_block_time - MAX(l_block->hdr.ts_created, DAP_REWARD_INIT_TIMESTAMP);
MULT_256_256(l_ret, GET_256_FROM_64(l_time_diff), &l_ret);
DIV_256(l_ret, GET_256_FROM_64(s_block_timediff_unit_size * l_signs_count), &l_ret);
return l_ret;
--
GitLab