From a0763ad95a82a1972194594569e3ee4413b100c5 Mon Sep 17 00:00:00 2001
From: Dmitry Gerasimov <dmitriy.gerasimov@demlabs.net>
Date: Wed, 22 Jun 2022 14:55:21 +0700
Subject: [PATCH] [*] Fix merge
---
modules/common/dap_chain_datum_tx_items.c | 2 +-
modules/net/dap_chain_node_cli_cmd.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/common/dap_chain_datum_tx_items.c b/modules/common/dap_chain_datum_tx_items.c
index 10456b810b..c109cf8b8a 100644
--- a/modules/common/dap_chain_datum_tx_items.c
+++ b/modules/common/dap_chain_datum_tx_items.c
@@ -336,7 +336,7 @@ dap_chain_tx_out_cond_t* dap_chain_datum_tx_item_out_cond_create_srv_pay(dap_pke
dap_chain_net_srv_price_unit_uid_t a_unit,
const void *a_params, size_t a_params_size)
{
- if (!a_key || !a_key->pkey)
+ if (!a_key || !a_key->header.size )
return NULL;
if (IS_ZERO_256(a_value))
return NULL;
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index d42a233fa2..edc59a2533 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -4440,11 +4440,11 @@ int com_tx_create_json(int a_argc, char ** a_argv, char **a_str_reply)
DAP_DELETE(l_tx);
// Add transaction to mempool
- char *l_gdb_group_mempool_base_tx = dap_chain_net_get_gdb_group_mempool(l_chain);// get group name for mempool
+ char *l_gdb_group_mempool_base_tx = dap_chain_net_get_gdb_group_mempool_new(l_chain);// get group name for mempool
dap_chain_hash_fast_t *l_datum_tx_hash = DAP_NEW(dap_hash_fast_t);
dap_hash_fast(l_datum_tx, l_datum_tx_size, l_datum_tx_hash);// Calculate datum hash
char *l_tx_hash_str = dap_chain_hash_fast_to_str_new(l_datum_tx_hash);
- bool l_placed = dap_chain_global_db_gr_set(l_tx_hash_str, l_datum_tx, l_datum_tx_size, l_gdb_group_mempool_base_tx);
+ bool l_placed = dap_global_db_set(l_gdb_group_mempool_base_tx,l_tx_hash_str, l_datum_tx, l_datum_tx_size, true, NULL,NULL );
DAP_DELETE(l_tx_hash_str);
DAP_DELETE(l_datum_tx);
--
GitLab