diff --git a/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c b/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c
index 1e330ae02de8bbcec498f6bd9aa1ff91669bb01c..9adf331969501b75852788421af50a3efb2e1606 100644
--- a/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c
+++ b/modules/channel/chain-net-srv/dap_stream_ch_chain_net_srv.c
@@ -30,20 +30,9 @@ along with any CellFrame SDK based project. If not, see <http://www.gnu.org/lic
#include "dap_hash.h"
#include "rand/dap_rand.h"
-//#include "dap_chain.h"
-//#include "dap_chain_datum_tx.h"
-//#include "dap_chain_datum_tx_in.h"
-//#include "dap_chain_datum_tx_in_cond.h"
-//#include "dap_chain_datum_tx_out.h"
-//#include "dap_chain_datum_tx_out_cond.h"
-//#include "dap_chain_datum_tx_receipt.h"
-//#include "dap_chain_mempool.h"
-//#include "dap_common.h"
-
#include "dap_chain_net_srv.h"
#include "dap_chain_net_srv_stream_session.h"
-
#include "dap_stream.h"
#include "dap_stream_ch.h"
#include "dap_stream_ch_pkt.h"
@@ -77,10 +66,18 @@ static void s_grace_period_start(dap_chain_net_srv_grace_t *a_grace);
static bool s_grace_period_finish(usages_in_grace_t *a_grace);
static inline void s_grace_error(dap_chain_net_srv_grace_t *a_grace, dap_stream_ch_chain_net_srv_pkt_error_t a_err){
+
+
dap_stream_ch_t * l_ch = dap_stream_ch_find_by_uuid_unsafe(a_grace->stream_worker, a_grace->ch_uuid);
dap_chain_net_srv_stream_session_t *l_srv_session = l_ch && l_ch->stream && l_ch->stream->session ?
(dap_chain_net_srv_stream_session_t *)l_ch->stream->session->_inheritor : NULL;
+ if (!l_srv_session){
+ DAP_DELETE(a_grace->request);
+ DAP_DELETE(a_grace);
+ return;
+ }
+
a_grace->usage->is_grace = false;
if (a_grace->usage->receipt_next){ // If not first grace-period
log_it( L_WARNING, "Next receipt is rejected. Waiting until current limits is over.");
@@ -377,15 +374,27 @@ static void s_grace_period_start(dap_chain_net_srv_grace_t *a_grace)
l_ticker = dap_chain_ledger_tx_get_token_ticker_by_hash(l_ledger, &a_grace->usage->tx_cond_hash);
dap_stpcpy(a_grace->usage->token_ticker, l_ticker);
+
+
dap_chain_net_srv_price_t *l_price_tmp;
DL_FOREACH(a_grace->usage->service->pricelist, l_price_tmp) {
if (l_price_tmp && l_price_tmp->net->pub.id.uint64 == a_grace->usage->net->pub.id.uint64
&& dap_strcmp(l_price_tmp->token, l_ticker) == 0
- && l_price_tmp->units_uid.enm == l_tx_out_cond->subtype.srv_pay.unit.enm
- )//&& (l_price_tmp->value_datoshi/l_price_tmp->units) < l_tx_out_cond->subtype.srv_pay.header.unit_price_max_datoshi)
+ && l_price_tmp->units_uid.enm == l_tx_out_cond->subtype.srv_pay.unit.enm)
{
- l_price = l_price_tmp;
- break;
+ uint256_t l_unit_price = {};
+ if (l_price_tmp->units != 0){
+ DIV_256(l_price_tmp->value_datoshi, GET_256_FROM_64(l_price_tmp->units), &l_unit_price);
+ } else {
+ break;
+ }
+
+ if(!compare256(uint256_0, l_tx_out_cond->subtype.srv_pay.unit_price_max_datoshi) ||
+ compare256(l_unit_price, l_tx_out_cond->subtype.srv_pay.unit_price_max_datoshi) <= 0){
+ l_price = l_price_tmp;
+ break;
+ }
+
}
}
if ( !l_price ) {
@@ -427,10 +436,6 @@ static bool s_grace_period_finish(usages_in_grace_t *a_grace_item)
dap_stream_ch_t *l_ch = dap_stream_ch_find_by_uuid_unsafe(l_grace->stream_worker, l_grace->ch_uuid);
- if (l_grace->usage->price && !l_grace->usage->receipt_next){ // if first grace delete price and set actual
- DAP_DEL_Z(l_grace->usage->price);
- }
-
if (!l_ch){
s_grace_error(l_grace, l_err);
HASH_DEL(s_grace_table, a_grace_item);
@@ -438,6 +443,10 @@ static bool s_grace_period_finish(usages_in_grace_t *a_grace_item)
return false;
}
+ if (l_grace->usage->price && !l_grace->usage->receipt_next){ // if first grace delete price and set actual
+ DAP_DEL_Z(l_grace->usage->price);
+ }
+
if (l_grace->usage->is_waiting_new_tx_cond){
log_it(L_INFO, "No new tx cond!");
s_grace_error(l_grace, l_err);
@@ -508,11 +517,20 @@ static bool s_grace_period_finish(usages_in_grace_t *a_grace_item)
DL_FOREACH(l_grace->usage->service->pricelist, l_price_tmp) {
if (l_price_tmp && l_price_tmp->net->pub.id.uint64 == l_grace->usage->net->pub.id.uint64
&& dap_strcmp(l_price_tmp->token, l_ticker) == 0
- && l_price_tmp->units_uid.enm == l_tx_out_cond->subtype.srv_pay.unit.enm
- )//&& (l_price_tmp->value_datoshi/l_price_tmp->units) < l_tx_out_cond->subtype.srv_pay.header.unit_price_max_datoshi)
+ && l_price_tmp->units_uid.enm == l_tx_out_cond->subtype.srv_pay.unit.enm)
{
- l_price = l_price_tmp;
- break;
+ uint256_t l_unit_price = {};
+ if (l_price_tmp->units != 0){
+ DIV_256(l_price_tmp->value_datoshi, GET_256_FROM_64(l_price_tmp->units), &l_unit_price);
+ } else {
+ break;
+ }
+
+ if(!compare256(uint256_0, l_tx_out_cond->subtype.srv_pay.unit_price_max_datoshi) ||
+ compare256(l_unit_price, l_tx_out_cond->subtype.srv_pay.unit_price_max_datoshi) <= 0){
+ l_price = l_price_tmp;
+ break;
+ }
}
}
if ( !l_price ) {
diff --git a/modules/net/srv/dap_chain_net_srv.c b/modules/net/srv/dap_chain_net_srv.c
index 4556ef32e5a89f944b60a2c84dc97aaed2357a19..dd21d64870c976391d6dc3ce041cbf54ba054fec 100644
--- a/modules/net/srv/dap_chain_net_srv.c
+++ b/modules/net/srv/dap_chain_net_srv.c
@@ -106,7 +106,7 @@ int dap_chain_net_srv_init()
"net_srv -net <net_name> order dump -hash <Order hash>\n"
"\tOrder dump info\n"
"net_srv -net <net_name> order create -direction {sell | buy} -srv_uid <Service UID> -price <Price>\n"
- " -price_unit <Price Unit> -price_token <token_ticker> [-node_addr <Node Address>] [-tx_cond <TX Cond Hash>]\n"
+ " -price_unit <Price Unit> -price_token <token_ticker> -units <units> [-node_addr <Node Address>] [-tx_cond <TX Cond Hash>]\n"
" [-expires <Unix time when expires>] [-cert <cert name to sign order>]\n"
" [{-ext <Extension with params> | -region <Region name> -continent <Continent name>}]\n"
#ifdef DAP_MODULES_DYNAMIC
@@ -516,7 +516,22 @@ static int s_cli_net_srv( int argc, char **argv, char **a_str_reply)
if (l_tx_cond_hash_str)
dap_chain_hash_fast_from_str (l_tx_cond_hash_str, &l_tx_cond_hash);
l_price = dap_chain_balance_scan(l_price_str);
- l_price_unit.uint32 = (uint32_t) atol ( l_price_unit_str );
+
+ if (!dap_strcmp(l_price_unit_str, "MB")){
+ l_price_unit.uint32 = SERV_UNIT_MB;
+ } else if (!dap_strcmp(l_price_unit_str, "SEC")){
+ l_price_unit.uint32 = SERV_UNIT_SEC;
+ } else if (!dap_strcmp(l_price_unit_str, "DAY")){
+ l_price_unit.uint32 = SERV_UNIT_DAY;
+ } else if (!dap_strcmp(l_price_unit_str, "KB")){
+ l_price_unit.uint32 = SERV_UNIT_KB;
+ } else if (!dap_strcmp(l_price_unit_str, "B")){
+ l_price_unit.uint32 = SERV_UNIT_B;
+ } else if (!dap_strcmp(l_price_unit_str, "PCS")){
+ l_price_unit.uint32 = SERV_UNIT_PCS;
+ } else
+ l_price_unit.uint32 = SERV_UNIT_UNDEFINED;
+
uint64_t l_units = atoi(l_units_str);
strncpy(l_price_token, l_price_token_str, DAP_CHAIN_TICKER_SIZE_MAX - 1);
size_t l_ext_len = l_ext? strlen(l_ext) + 1 : 0;
@@ -680,7 +695,6 @@ static bool s_fee_verificator_callback(dap_ledger_t *a_ledger, UNUSED_ARG dap_ch
static bool s_pay_verificator_callback(dap_ledger_t * a_ledger, dap_chain_tx_out_cond_t *a_cond,
dap_chain_datum_tx_t *a_tx_in, bool a_owner)
{
- UNUSED(a_ledger);
if (a_owner)
return true;
dap_chain_datum_tx_receipt_t *l_receipt = (dap_chain_datum_tx_receipt_t *)
@@ -692,10 +706,12 @@ static bool s_pay_verificator_callback(dap_ledger_t * a_ledger, dap_chain_tx_out
// Check provider sign
dap_sign_t *l_sign = dap_chain_datum_tx_receipt_sign_get(l_receipt, l_receipt->size, 0);
+
if (!l_sign){
log_it(L_ERROR, "Can't get provider sign from receipt.");
return false;
}
+ dap_sign_type_t l_provider_sign_type = l_sign->header.type;
if (dap_sign_verify_all(l_sign, dap_sign_get_size(l_sign), &l_receipt->receipt_info, sizeof(l_receipt->receipt_info))){
log_it(L_ERROR, "Provider sign in receipt not passed verification.");
@@ -750,14 +766,57 @@ static bool s_pay_verificator_callback(dap_ledger_t * a_ledger, dap_chain_tx_out
return false;
}
- return true;
+ // Check price is less than maximum
+ dap_chain_tx_in_cond_t *l_tx_in_cond = (dap_chain_tx_in_cond_t *)dap_chain_datum_tx_item_get(a_tx_in, 0, TX_ITEM_TYPE_IN_COND, 0);
+ dap_chain_datum_tx_t *l_tx_prev = dap_chain_ledger_tx_find_by_hash(a_ledger , &l_tx_in_cond->header.tx_prev_hash);
+ dap_chain_tx_out_cond_t *l_prev_out_cond = dap_chain_datum_tx_out_cond_get(l_tx_prev, DAP_CHAIN_TX_OUT_COND_SUBTYPE_SRV_PAY, NULL);
+
+ uint256_t l_unit_price = {};
+ if (l_receipt->receipt_info.units != 0){
+ DIV_256(l_receipt->receipt_info.value_datoshi, GET_256_FROM_64(l_receipt->receipt_info.units), &l_unit_price);
+ } else {
+ return false;
+ }
+
+ if( compare256(uint256_0, l_prev_out_cond->subtype.srv_pay.unit_price_max_datoshi) &&
+ compare256(l_unit_price, l_prev_out_cond->subtype.srv_pay.unit_price_max_datoshi) > 0){
+ log_it(L_ERROR, "Value in receipt is exceed max allowable price.");
+ return false;
+ }
+
+ // Check out value is equal to value in receipt
+ int items_count = 0;
+ dap_list_t * items_list = dap_chain_datum_tx_items_get(a_tx_in, TX_ITEM_TYPE_OUT, &items_count);
+ dap_chain_addr_t l_provider_addr = {};
+ dap_chain_addr_fill(&l_provider_addr, l_provider_sign_type, &l_provider_pkey_hash, dap_chain_net_id_by_name(a_ledger->net_name));
+
+ dap_list_t * list_item = items_list;
+ for (int i = 0; i < items_count; i++){
+ dap_chain_tx_out_t *l_out = (dap_chain_tx_out_t*)list_item->data;
+ if (dap_chain_addr_compare(&l_provider_addr, &l_out->addr))
+ {
+ if(!compare256(l_out->header.value, l_receipt->receipt_info.value_datoshi)){
+ dap_list_free(items_list);
+ return true;
+ }else{
+ dap_list_free(items_list);
+ log_it(L_ERROR, "Value in tx out is not equal to value in receipt.");
+ return false;
+
+ }
+ }
+ items_list = items_list->next;
+ }
+ dap_list_free(items_list);
+ log_it(L_ERROR, "Can't find OUT in tx matching provider.");
+ return false;
}
int dap_chain_net_srv_price_apply_from_my_order(dap_chain_net_srv_t *a_srv, const char *a_config_section){
const char *l_wallet_path = dap_config_get_item_str_default(g_config, "resources", "wallets_path", NULL);
const char *l_wallet_name = dap_config_get_item_str_default(g_config, a_config_section, "wallet", NULL);
const char *l_net_name = dap_config_get_item_str_default(g_config, a_config_section, "net", NULL);
- if (!l_wallet_path || !l_wallet_name || l_net_name){
+ if (!l_wallet_path || !l_wallet_name || !l_net_name){
return -2;
}
dap_chain_wallet_t *l_wallet = dap_chain_wallet_open(l_wallet_name, l_wallet_path);
@@ -790,6 +849,7 @@ int dap_chain_net_srv_price_apply_from_my_order(dap_chain_net_srv_t *a_srv, cons
l_price->units = l_order->units;
l_price->units_uid = l_order->price_unit;
l_price->wallet = l_wallet;
+ DL_APPEND(a_srv->pricelist, l_price);
break;
}
DAP_DELETE(l_order);
@@ -1118,7 +1178,7 @@ const dap_chain_net_srv_uid_t * dap_chain_net_srv_list(void)
* @param a_price
* @return
*/
-dap_chain_datum_tx_receipt_t * dap_chain_net_srv_issue_receipt(dap_chain_net_srv_t *a_srv,
+dap_chain_datum_tx_receipt_t * dap_chain_net_srv_issue_receipt(dap_chain_net_srv_t *a_srv,
dap_chain_net_srv_price_t * a_price,
const void * a_ext, size_t a_ext_size)
{
diff --git a/modules/net/srv/dap_chain_net_srv_order.c b/modules/net/srv/dap_chain_net_srv_order.c
index 0bce760dbe92f80f10ac00d9ce2045d084c69543..d817c90f129c48db710eb21bf8952d0b98cbd16f 100644
--- a/modules/net/srv/dap_chain_net_srv_order.c
+++ b/modules/net/srv/dap_chain_net_srv_order.c
@@ -118,7 +118,7 @@ int dap_chain_net_srv_order_init(void)
dap_chain_net_add_gdb_notify_callback(l_net_list[i], s_srv_order_callback_notify, l_net_list[i]);
}
//geoip_info_t *l_ipinfo = chain_net_geoip_get_ip_info("8.8.8.8");
- if (!dap_config_get_item_bool_default(g_config, "srv", "allow_unverified_orders", false)) {
+ if (!dap_config_get_item_bool_default(g_config, "srv", "allow_unverified_orders", true)) {
uint32_t l_unverified_orders_lifetime = dap_config_get_item_uint32_default(g_config, "srv", "unverified_orders_lifetime", 21600); // 6 Hours
s_timer_order_check_decree_sign = dap_interval_timer_create(l_unverified_orders_lifetime * 1000,
(dap_timer_callback_t)s_srv_order_check_decree_sign_timer,
diff --git a/modules/service/vpn/dap_chain_net_srv_vpn.c b/modules/service/vpn/dap_chain_net_srv_vpn.c
index a50285aa9e9c427dc4d660605d86ec01cb0e225c..34c5e8f2b69895e1040a2481b8889496c88bd0a4 100644
--- a/modules/service/vpn/dap_chain_net_srv_vpn.c
+++ b/modules/service/vpn/dap_chain_net_srv_vpn.c
@@ -949,15 +949,17 @@ static int s_callback_response_success(dap_chain_net_srv_t * a_srv, uint32_t a_u
return -1;
}
l_usage_client->usage_id = a_usage_id;
- l_usage_client->receipt = DAP_NEW_SIZE(dap_chain_datum_tx_receipt_t,l_receipt_size);
- if (!l_usage_client->receipt) {
- log_it(L_ERROR, "Memory allocation error in s_callback_response_success");
- DAP_DEL_Z(l_usage_client);
- return -1;
- }
- memcpy(l_usage_client->receipt, l_receipt, l_receipt_size);
+ if (!l_usage_active->is_free){
+ l_usage_client->receipt = DAP_NEW_SIZE(dap_chain_datum_tx_receipt_t,l_receipt_size);
+ if (!l_usage_client->receipt) {
+ log_it(L_ERROR, "Memory allocation error in s_callback_response_success");
+ DAP_DEL_Z(l_usage_client);
+ return -1;
+ }
+ memcpy(l_usage_client->receipt, l_receipt, l_receipt_size);
+ }
pthread_rwlock_wrlock(&s_clients_rwlock);
HASH_ADD(hh, s_clients,usage_id,sizeof(a_usage_id),l_usage_client);
l_srv_session->usage_active = l_usage_active;