From 5c0fd69befffa429001181ec0e3f626e395ec832 Mon Sep 17 00:00:00 2001
From: "roman.khlopkov" <roman.khlopkov@demlabs.net>
Date: Fri, 31 May 2024 15:56:41 +0700
Subject: [PATCH] [*] Decrees correction
---
dap-sdk | 2 +-
modules/common/dap_chain_datum_decree.c | 22 +++++++++----------
.../consensus/esbocs/dap_chain_cs_esbocs.c | 8 +++----
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dap-sdk b/dap-sdk
index f5409cdd40..b12d92231b 160000
--- a/dap-sdk
+++ b/dap-sdk
@@ -1 +1 @@
-Subproject commit f5409cdd40208193ec7d0e577318bfeb30f994e5
+Subproject commit b12d92231b4902df2b839bf495dbc7b57bf82c8c
diff --git a/modules/common/dap_chain_datum_decree.c b/modules/common/dap_chain_datum_decree.c
index 951b8d0474..8b681cfe8d 100644
--- a/modules/common/dap_chain_datum_decree.c
+++ b/modules/common/dap_chain_datum_decree.c
@@ -177,7 +177,7 @@ void dap_chain_datum_decree_dump(dap_string_t *a_str_out, dap_chain_datum_decree
l_offset += dap_tsd_size(l_tsd);
switch(l_tsd->type) {
case DAP_CHAIN_DATUM_DECREE_TSD_TYPE_VALUE:
- if (l_tsd->size > sizeof(uint256_t)){
+ if (l_tsd->size != sizeof(uint256_t)){
dap_string_append_printf(a_str_out, "\tValue: <WRONG SIZE>\n");
break;
}
@@ -189,7 +189,7 @@ void dap_chain_datum_decree_dump(dap_string_t *a_str_out, dap_chain_datum_decree
case DAP_CHAIN_DATUM_DECREE_TSD_TYPE_SIGN:
break;
case DAP_CHAIN_DATUM_DECREE_TSD_TYPE_FEE:
- if (l_tsd->size > sizeof(uint256_t)){
+ if (l_tsd->size != sizeof(uint256_t)){
dap_string_append_printf(a_str_out, "\tFee: <WRONG SIZE>\n");
break;
}
@@ -199,7 +199,7 @@ void dap_chain_datum_decree_dump(dap_string_t *a_str_out, dap_chain_datum_decree
dap_string_append_printf(a_str_out, "\tFee: %s\n", l_fee_value_str);
break;
case DAP_CHAIN_DATUM_DECREE_TSD_TYPE_OWNER:
- if (l_tsd->size < sizeof(dap_pkey_t)) {
+ if (l_tsd->size != sizeof(dap_pkey_t)) {
dap_string_append_printf(a_str_out, "\tOwner fingerprint: <WRONG SIZE>\n");
break;
}
@@ -210,7 +210,7 @@ void dap_chain_datum_decree_dump(dap_string_t *a_str_out, dap_chain_datum_decree
dap_string_append_printf(a_str_out, "\tOwner fingerprint: %s\n", l_owner_pkey_str);
break;
case DAP_CHAIN_DATUM_DECREE_TSD_TYPE_MIN_OWNER:
- if (l_tsd->size != sizeof(uint32_t)){
+ if (l_tsd->size != sizeof(uint256_t)) {
dap_string_append_printf(a_str_out, "\tOwner min: <WRONG SIZE>\n");
break;
}
@@ -220,7 +220,7 @@ void dap_chain_datum_decree_dump(dap_string_t *a_str_out, dap_chain_datum_decree
dap_string_append_printf(a_str_out, "\tOwner min: %s\n", l_owner_min_str);
break;
case DAP_CHAIN_DATUM_DECREE_TSD_TYPE_FEE_WALLET:
- if (l_tsd->size > sizeof(dap_chain_addr_t)) {
+ if (l_tsd->size != sizeof(dap_chain_addr_t)) {
dap_string_append_printf(a_str_out, "\tWallet for fee: <WRONG SIZE>\n");
break;
}
@@ -229,7 +229,7 @@ void dap_chain_datum_decree_dump(dap_string_t *a_str_out, dap_chain_datum_decree
dap_string_append_printf(a_str_out, "\tWallet for fee: %s\n", dap_chain_addr_to_str(l_addr_fee_wallet));
break;
case DAP_CHAIN_DATUM_DECREE_TSD_TYPE_HASH:
- if (l_tsd->size > sizeof(dap_hash_fast_t)) {
+ if (l_tsd->size != sizeof(dap_hash_fast_t)) {
dap_string_append_printf(a_str_out, "\tHash: <WRONG SIZE>\n");
break;
}
@@ -241,7 +241,7 @@ void dap_chain_datum_decree_dump(dap_string_t *a_str_out, dap_chain_datum_decree
dap_string_append_printf(a_str_out, "\tHash: %s\n", l_stake_tx_hash);
break;
case DAP_CHAIN_DATUM_DECREE_TSD_TYPE_STAKE_VALUE:
- if (l_tsd->size > sizeof(uint256_t)){
+ if (l_tsd->size != sizeof(uint256_t)){
dap_string_append_printf(a_str_out, "\tStake value: <WRONG SIZE>\n");
break;
}
@@ -251,7 +251,7 @@ void dap_chain_datum_decree_dump(dap_string_t *a_str_out, dap_chain_datum_decree
dap_string_append_printf(a_str_out, "\tStake value: %s\n", l_stake_value_str);
break;
case DAP_CHAIN_DATUM_DECREE_TSD_TYPE_STAKE_SIGNING_ADDR:
- if (l_tsd->size > sizeof(dap_chain_addr_t)) {
+ if (l_tsd->size != sizeof(dap_chain_addr_t)) {
dap_string_append_printf(a_str_out, "\tSigning addr: <WRONG SIZE>\n");
break;
}
@@ -265,7 +265,7 @@ void dap_chain_datum_decree_dump(dap_string_t *a_str_out, dap_chain_datum_decree
dap_string_append_printf(a_str_out, "\tSigning pkey fingerprint: %s\n", l_pkey_signing_str);
break;
case DAP_CHAIN_DATUM_DECREE_TSD_TYPE_NODE_ADDR:
- if(l_tsd->size > sizeof(dap_chain_node_addr_t)){
+ if (l_tsd->size != sizeof(dap_chain_node_addr_t)){
dap_string_append_printf(a_str_out, "\tNode addr: <WRONG SIZE>\n");
break;
}
@@ -274,7 +274,7 @@ void dap_chain_datum_decree_dump(dap_string_t *a_str_out, dap_chain_datum_decree
NODE_ADDR_FP_ARGS(l_node_addr));
break;
case DAP_CHAIN_DATUM_DECREE_TSD_TYPE_STAKE_MIN_VALUE:
- if (l_tsd->size > sizeof(uint256_t)) {
+ if (l_tsd->size != sizeof(uint256_t)) {
dap_string_append_printf(a_str_out, "\tMin value: <WRONG SIZE>\n");
break;
}
@@ -284,7 +284,7 @@ void dap_chain_datum_decree_dump(dap_string_t *a_str_out, dap_chain_datum_decree
dap_string_append_printf(a_str_out, "\tMin value: %s\n", l_min_value_str);
break;
case DAP_CHAIN_DATUM_DECREE_TSD_TYPE_STAKE_MIN_SIGNERS_COUNT:
- if (l_tsd->size > sizeof(uint256_t)) {
+ if (l_tsd->size != sizeof(uint256_t)) {
dap_string_append_printf(a_str_out, "\tMin signers count: <WRONG SIZE>\n");
break;
}
diff --git a/modules/consensus/esbocs/dap_chain_cs_esbocs.c b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
index 9bac8e2cf8..5f494a41a1 100644
--- a/modules/consensus/esbocs/dap_chain_cs_esbocs.c
+++ b/modules/consensus/esbocs/dap_chain_cs_esbocs.c
@@ -192,9 +192,9 @@ int dap_chain_cs_esbocs_init()
"\tEnables or disables checks for blocks signs structure validity\n"
"esbocs check_signs_structure show -net <net_name> -chain <chain_name>\n"
"\tShow status of checks for blocks signs structure validity\n"
- "esbocs emergency_validator {add|remove} -net <net_name> -chain <chain_name> -cert <poa_cert_name> -pkey_hash <validator_pkey_hash>\n"
+ "esbocs emergency_validators {add|remove} -net <net_name> -chain <chain_name> -cert <poa_cert_name> -pkey_hash <validator_pkey_hash>\n"
"\tAdd or remove validator by its signature public key hash to list of validators allowed to work in emergency mode\n"
- "esbocs emergency_validator show -net <net_name> -chain <chain_name>\n"
+ "esbocs emergency_validators show -net <net_name> -chain <chain_name>\n"
"\tShow list of validators public key hashes allowed to work in emergency mode\n");
return 0;
}
@@ -2989,7 +2989,7 @@ static int s_cli_esbocs(int a_argc, char **a_argv, void **a_str_reply)
[SUBCMD_UNDEFINED] = NULL,
[SUBCMD_MIN_VALIDATORS_COUNT] = "min_validators_count",
[SUBCMD_CHECK_SIGNS_STRUCTURE] = "check_signs_structure",
- [SUBCMD_EMERGENCY_VALIDATOR] = "emergency_validator",
+ [SUBCMD_EMERGENCY_VALIDATOR] = "emergency_validators",
};
const size_t l_subcmd_str_count = sizeof(l_subcmd_strs) / sizeof(char *);
@@ -3120,7 +3120,7 @@ static int s_cli_esbocs(int a_argc, char **a_argv, void **a_str_reply)
} break;
default:
- dap_cli_server_cmd_set_reply_text(a_str_reply, "Unrecognized subcommand '%s'", a_argv[l_arg_index]);
+ dap_cli_server_cmd_set_reply_text(a_str_reply, "Unrecognized subcommand '%s'", a_argv[l_arg_index - 1]);
}
return ret;
}
--
GitLab