From 4fbfd036bbc90cf2f6858bf2cd134640bb35c378 Mon Sep 17 00:00:00 2001
From: "daniil.frolov" <daniil.frolov@demlabs.net>
Date: Fri, 10 Jan 2025 10:45:33 +0300
Subject: [PATCH 1/2] [*] Fix tx_create_json for inputs with hash and index
---
modules/net/dap_chain_node_cli_cmd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index b2c36368e2..5015ced1cc 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -6252,7 +6252,7 @@ int com_tx_create_json(int a_argc, char ** a_argv, void **a_json_arr_reply)
switch (l_item_type) {
case TX_ITEM_TYPE_IN: {
const char *l_json_item_token = s_json_get_text(l_json_item_obj, "token");
- if (dap_strcmp(l_json_item_token, l_native_token)){
+ if (l_json_item_token && dap_strcmp(l_json_item_token, l_native_token)){
l_multichanel = true;
l_main_token = l_json_item_token;
}
--
GitLab
From 5dbd70bf83427f156bf0f06359034f2ab5a05318 Mon Sep 17 00:00:00 2001
From: "daniil.frolov" <daniil.frolov@demlabs.net>
Date: Fri, 10 Jan 2025 11:03:04 +0300
Subject: [PATCH 2/2] [*] Fix value_need counting for single channel tx
---
modules/net/dap_chain_node_cli_cmd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 5015ced1cc..663e6e8211 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -6365,7 +6365,7 @@ int com_tx_create_json(int a_argc, char ** a_argv, void **a_json_arr_reply)
}
l_item = (const uint8_t*) l_out_item;
if (l_item){
- if (!dap_strcmp(l_token, l_native_token))
+ if (l_multichanel && !dap_strcmp(l_token, l_native_token))
SUM_256_256(l_value_need_fee, l_value, &l_value_need_fee);
else
SUM_256_256(l_value_need, l_value, &l_value_need);
--
GitLab