From 959b4f778c02f0e0cb71d626f9ddf8982577eb70 Mon Sep 17 00:00:00 2001
From: Aleksandr Lysikov <lysikov@inbox.ru>
Date: Sat, 18 May 2019 23:09:08 +0500
Subject: [PATCH] added support dap_ledger_t
---
dap_chain_net_srv_common.c | 8 ++++----
dap_chain_net_srv_common.h | 4 +++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/dap_chain_net_srv_common.c b/dap_chain_net_srv_common.c
index c508ec2..350b84e 100755
--- a/dap_chain_net_srv_common.c
+++ b/dap_chain_net_srv_common.c
@@ -26,11 +26,10 @@
#include <stdint.h>
#include "dap_strfuncs.h"
#include "rand/dap_rand.h"
-#include "dap_chain_net_srv_common.h"
#include "dap_chain_datum_tx_items.h"
-#include "dap_chain_utxo.h"
#include "dap_stream.h"
#include "dap_server_http_db_auth.h"
+#include "dap_chain_net_srv_common.h"
/**
* copy a_value_dst to a_uid_src
@@ -73,7 +72,8 @@ void dap_chain_net_srv_abstract_set(dap_chain_net_srv_abstract_t *a_cond, uint8_
/**
*
*/
-uint64_t dap_chain_net_srv_client_auth(const char *a_service_key, const dap_chain_net_srv_abstract_t **a_cond_out)
+uint64_t dap_chain_net_srv_client_auth(dap_ledger_t *a_ledger,
+ const char *a_service_key, const dap_chain_net_srv_abstract_t **a_cond_out)
{
char *l_addr_base58;
char *l_sign_hash_str;
@@ -92,7 +92,7 @@ uint64_t dap_chain_net_srv_client_auth(const char *a_service_key, const dap_chai
memcpy(&l_sig_type, &l_addr->sig_type, sizeof(dap_chain_sign_type_t));
// Search all value in transactions with l_addr in 'out_cond' item
- uint64_t l_value = dap_chain_utxo_tx_cache_get_out_cond_value(l_addr, &l_tx_out_cond);
+ uint64_t l_value = dap_chain_ledger_tx_cache_get_out_cond_value(a_ledger, l_addr, &l_tx_out_cond);
DAP_DELETE(l_addr);
// not found transaction with l_addr in 'out_cond' item
if(!l_value)
diff --git a/dap_chain_net_srv_common.h b/dap_chain_net_srv_common.h
index 6fe166d..4dd27fd 100755
--- a/dap_chain_net_srv_common.h
+++ b/dap_chain_net_srv_common.h
@@ -29,6 +29,7 @@
#include "dap_math_ops.h"
#include "dap_server.h"
#include "dap_stream_ch.h"
+#include "dap_chain_ledger.h"
#define DAP_CHAIN_NET_SRV_UID_SIZE 16
typedef union {
@@ -105,4 +106,5 @@ void dap_chain_net_srv_uid_set(dap_chain_net_srv_uid_t *a_uid_src, uint128_t a_v
// generate new dap_chain_net_srv_uid_t
bool dap_chain_net_srv_gen_uid(uint8_t *a_srv, size_t a_srv_size);
-uint64_t dap_chain_net_srv_client_auth(const char *a_service_key, const dap_chain_net_srv_abstract_t **a_cond_out);
+uint64_t dap_chain_net_srv_client_auth(dap_ledger_t *a_ledger,
+ const char *a_service_key, const dap_chain_net_srv_abstract_t **a_cond_out);
--
GitLab