diff --git a/dap-sdk/core/include/dap_common.h b/dap-sdk/core/include/dap_common.h index abda812c208bf9804a17e41019220c68c8d8c621..4e5939c65d22b15d83b9f892e0b248e47b2a74fb 100755 --- a/dap-sdk/core/include/dap_common.h +++ b/dap-sdk/core/include/dap_common.h @@ -196,8 +196,7 @@ DAP_STATIC_INLINE void _dap_aligned_free( void *ptr ) #elif __SIZEOF_LONG__==4 #define DAP_UINT64_FORMAT_X "llX" #define DAP_UINT64_FORMAT_x "llx" -#define DAP_UINT64_FORMAT_u "llu" -#define DAP_UINT64_FORMAT_U "llU" +#define DAP_UINT64_FORMAT_U "llu" #else #error "DAP_UINT64_FORMAT_* are undefined for your platform" #endif diff --git a/dap-sdk/crypto/src/dap_enc_dilithium.c b/dap-sdk/crypto/src/dap_enc_dilithium.c index ede8f973cd0124e932040ac9e0c2554443ab127f..aa9821f1bca46cad28006baa628f3100087e5e30 100755 --- a/dap-sdk/crypto/src/dap_enc_dilithium.c +++ b/dap-sdk/crypto/src/dap_enc_dilithium.c @@ -178,7 +178,7 @@ dilithium_signature_t* dap_enc_dilithium_read_signature(uint8_t *a_buf, size_t a l_shift_mem += sizeof(uint64_t); if( l_sign->sig_len> (UINT64_MAX - l_shift_mem ) ){ - log_it(L_ERROR,"::read_signature() Buflen inside signature %"DAP_UINT64_FORMAT_u" is too big ", l_sign->sig_len); + log_it(L_ERROR,"::read_signature() Buflen inside signature %"DAP_UINT64_FORMAT_U" is too big ", l_sign->sig_len); DAP_DELETE(l_sign); return NULL; } @@ -196,7 +196,7 @@ dilithium_signature_t* dap_enc_dilithium_read_signature(uint8_t *a_buf, size_t a } if( (uint64_t) a_buflen < (l_shift_mem + l_sign->sig_len) ){ - log_it(L_ERROR,"::read_signature() Buflen %zd is smaller than all fields together(%"DAP_UINT64_FORMAT_u")", a_buflen, + log_it(L_ERROR,"::read_signature() Buflen %zd is smaller than all fields together(%"DAP_UINT64_FORMAT_U")", a_buflen, l_shift_mem + l_sign->sig_len ); DAP_DELETE(l_sign); return NULL; @@ -204,7 +204,7 @@ dilithium_signature_t* dap_enc_dilithium_read_signature(uint8_t *a_buf, size_t a l_sign->sig_data = DAP_NEW_SIZE(unsigned char, l_sign->sig_len); if (!l_sign->sig_data){ - log_it(L_ERROR,"::read_signature() Can't allocate sig_data %"DAP_UINT64_FORMAT_u" size", l_sign->sig_len); + log_it(L_ERROR,"::read_signature() Can't allocate sig_data %"DAP_UINT64_FORMAT_U" size", l_sign->sig_len); DAP_DELETE(l_sign); return NULL; }else{ @@ -240,13 +240,13 @@ dilithium_signature_t* dap_enc_dilithium_read_signature_old(uint8_t *a_buf, size uint64_t l_shift_mem = sizeof(uint32_t) + sizeof(uint32_t); memcpy(&l_sign->sig_len, a_buf + l_shift_mem, sizeof(unsigned long long)); if( l_sign->sig_len> (UINT64_MAX - l_shift_mem ) ){ - log_it(L_ERROR,"::read_signature_old() Buflen inside signature %"DAP_UINT64_FORMAT_u" is too big ", l_sign->sig_len); + log_it(L_ERROR,"::read_signature_old() Buflen inside signature %"DAP_UINT64_FORMAT_U" is too big ", l_sign->sig_len); DAP_DELETE(l_sign); return NULL; } if( (uint64_t) a_buflen < (l_shift_mem + l_sign->sig_len) ){ - log_it(L_ERROR,"::read_signature_old() Buflen %zd is smaller than all fields together(%" DAP_UINT64_FORMAT_u")", a_buflen, + log_it(L_ERROR,"::read_signature_old() Buflen %zd is smaller than all fields together(%" DAP_UINT64_FORMAT_U")", a_buflen, l_shift_mem + l_sign->sig_len ); DAP_DELETE(l_sign); return NULL; @@ -255,7 +255,7 @@ dilithium_signature_t* dap_enc_dilithium_read_signature_old(uint8_t *a_buf, size l_shift_mem += sizeof(unsigned long long); l_sign->sig_data = DAP_NEW_SIZE(unsigned char, l_sign->sig_len); if (!l_sign->sig_data) - log_it(L_ERROR,"::read_signature_old() Can't allocate sig_data %"DAP_UINT64_FORMAT_u" size", l_sign->sig_len); + log_it(L_ERROR,"::read_signature_old() Can't allocate sig_data %"DAP_UINT64_FORMAT_U" size", l_sign->sig_len); memcpy(l_sign->sig_data, a_buf + l_shift_mem, l_sign->sig_len); return l_sign; @@ -288,13 +288,13 @@ dilithium_signature_t* dap_enc_dilithium_read_signature_old2(uint8_t *a_buf, siz uint64_t l_shift_mem = sizeof(uint32_t) + sizeof(uint64_t); memcpy(&l_sign->sig_len, a_buf + l_shift_mem, sizeof(unsigned long long)); if( l_sign->sig_len> (UINT64_MAX - l_shift_mem ) ){ - log_it(L_ERROR,"::read_signature_old() Buflen inside signature %"DAP_UINT64_FORMAT_u" is too big ", l_sign->sig_len); + log_it(L_ERROR,"::read_signature_old() Buflen inside signature %"DAP_UINT64_FORMAT_U" is too big ", l_sign->sig_len); DAP_DELETE(l_sign); return NULL; } if( (uint64_t) a_buflen < (l_shift_mem + l_sign->sig_len) ){ - log_it(L_ERROR,"::read_signature_old() Buflen %zd is smaller than all fields together(%" DAP_UINT64_FORMAT_u")", a_buflen, + log_it(L_ERROR,"::read_signature_old() Buflen %zd is smaller than all fields together(%" DAP_UINT64_FORMAT_U")", a_buflen, l_shift_mem + l_sign->sig_len ); DAP_DELETE(l_sign); return NULL; @@ -304,7 +304,7 @@ dilithium_signature_t* dap_enc_dilithium_read_signature_old2(uint8_t *a_buf, siz l_shift_mem += sizeof(unsigned long long); l_sign->sig_data = DAP_NEW_SIZE(unsigned char, l_sign->sig_len); if (!l_sign->sig_data) - log_it(L_ERROR,"::read_signature_old() Can't allocate sig_data %"DAP_UINT64_FORMAT_u" size", l_sign->sig_len); + log_it(L_ERROR,"::read_signature_old() Can't allocate sig_data %"DAP_UINT64_FORMAT_U" size", l_sign->sig_len); memcpy(l_sign->sig_data, a_buf + l_shift_mem, l_sign->sig_len); return l_sign; } @@ -440,7 +440,7 @@ dilithium_public_key_t* dap_enc_dilithium_read_public_key(const uint8_t *a_buf, if(l_buflen != (uint64_t) a_buflen){ if (l_buflen <<32 >>32 != (uint64_t) a_buflen ){ - log_it(L_ERROR,"::read_public_key() Buflen field inside buffer is %"DAP_UINT64_FORMAT_u" when expected to be %" DAP_UINT64_FORMAT_u, + log_it(L_ERROR,"::read_public_key() Buflen field inside buffer is %"DAP_UINT64_FORMAT_U" when expected to be %" DAP_UINT64_FORMAT_U, l_buflen,(uint64_t) a_buflen); return NULL; }else diff --git a/dap-sdk/net/client/dap_client_http.c b/dap-sdk/net/client/dap_client_http.c index e9ed600d2e3eb45dd6fcdd92282bba4197b1f6c2..fc58b1836335fe1f11f3697d1eaee835d2d3c3f2 100644 --- a/dap-sdk/net/client/dap_client_http.c +++ b/dap-sdk/net/client/dap_client_http.c @@ -599,7 +599,7 @@ void* dap_client_http_request_custom(dap_worker_t * a_worker, const char *a_upli dap_events_socket_uuid_t * l_ev_uuid_ptr = DAP_NEW_Z(dap_events_socket_uuid_t); *l_ev_uuid_ptr = l_ev_socket->uuid; if (!dap_timerfd_start_on_worker(l_http_pvt->worker,s_client_timeout_ms, s_timer_timeout_check, l_ev_uuid_ptr)) { - log_it(L_ERROR,"Can't run timer on worker %u for esocket uuid %"DAP_UINT64_FORMAT_u" for timeout check during connection attempt ", + log_it(L_ERROR,"Can't run timer on worker %u for esocket uuid %"DAP_UINT64_FORMAT_U" for timeout check during connection attempt ", l_http_pvt->worker->id, *l_ev_uuid_ptr); DAP_DEL_Z(l_ev_uuid_ptr) } @@ -622,7 +622,7 @@ void* dap_client_http_request_custom(dap_worker_t * a_worker, const char *a_upli dap_events_socket_uuid_t * l_ev_uuid_ptr = DAP_NEW_Z(dap_events_socket_uuid_t); *l_ev_uuid_ptr = l_ev_socket->uuid; if(dap_timerfd_start_on_worker(l_http_pvt->worker,s_client_timeout_ms, s_timer_timeout_check,l_ev_uuid_ptr) == NULL){ - log_it(L_ERROR,"Can't run timer on worker %u for esocket uuid %"DAP_UINT64_FORMAT_u" for timeout check during connection attempt ", + log_it(L_ERROR,"Can't run timer on worker %u for esocket uuid %"DAP_UINT64_FORMAT_U" for timeout check during connection attempt ", l_http_pvt->worker->id, *l_ev_uuid_ptr); DAP_DEL_Z(l_ev_uuid_ptr); } diff --git a/dap-sdk/net/client/dap_client_pvt.c b/dap-sdk/net/client/dap_client_pvt.c index 7e93007e3e0fb5c94b95d948f5ea1d7d23dacf84..17a66b83ba1da020471036134801ca1fd72463a2 100644 --- a/dap-sdk/net/client/dap_client_pvt.c +++ b/dap-sdk/net/client/dap_client_pvt.c @@ -218,7 +218,7 @@ static void s_stream_connected(dap_client_pvt_t * a_client_pvt) assert(a_client_pvt->stream_es); *l_es_uuid_ptr = a_client_pvt->stream_es->uuid; if( dap_timerfd_start_on_worker(a_client_pvt->stream_es->worker, s_client_timeout_read_after_connect_seconds * 1000, s_stream_timer_timeout_after_connected_check ,l_es_uuid_ptr) == NULL ){ - log_it(L_ERROR,"Can't run timer for stream after connect check for esocket uuid %"DAP_UINT64_FORMAT_u" "); + log_it(L_ERROR,"Can't run timer for stream after connect check for esocket uuid %"DAP_UINT64_FORMAT_U" "); DAP_DEL_Z(l_es_uuid_ptr); } } @@ -258,7 +258,7 @@ static bool s_stream_timer_timeout_check(void * a_arg) log_it(L_DEBUG,"Socket %d is connected, close check timer", l_es->socket); }else if(s_debug_more) - log_it(L_DEBUG,"Esocket %"DAP_UINT64_FORMAT_u" is finished, close check timer", *l_es_uuid_ptr); + log_it(L_DEBUG,"Esocket %"DAP_UINT64_FORMAT_U" is finished, close check timer", *l_es_uuid_ptr); DAP_DEL_Z(l_es_uuid_ptr) return false; @@ -302,7 +302,7 @@ static bool s_stream_timer_timeout_after_connected_check(void * a_arg) }else if(s_debug_more) - log_it(L_DEBUG,"Streaming socket %"DAP_UINT64_FORMAT_u" is finished, close check timer", *l_es_uuid_ptr); + log_it(L_DEBUG,"Streaming socket %"DAP_UINT64_FORMAT_U" is finished, close check timer", *l_es_uuid_ptr); DAP_DEL_Z(l_es_uuid_ptr); return false; diff --git a/dap-sdk/net/core/dap_events_socket.c b/dap-sdk/net/core/dap_events_socket.c index e17c0c52f95ce9f9a2509e7db6889c5adb8d58ea..982eccfb684943d10db91b7bafa91fe1b601df96 100644 --- a/dap-sdk/net/core/dap_events_socket.c +++ b/dap-sdk/net/core/dap_events_socket.c @@ -1576,7 +1576,7 @@ void dap_events_socket_worker_poll_update_unsafe(dap_events_socket_t * a_esocket } } if (l_is_error && l_errno == EBADF){ - log_it(L_ATT,"Poll update: socket %d (%p ) disconnected, rise CLOSE flag to remove from queue, lost %"DAP_UINT64_FORMAT_u":%" DAP_UINT64_FORMAT_u + log_it(L_ATT,"Poll update: socket %d (%p ) disconnected, rise CLOSE flag to remove from queue, lost %"DAP_UINT64_FORMAT_U":%" DAP_UINT64_FORMAT_U " bytes",a_esocket->socket,a_esocket,a_esocket->buf_in_size,a_esocket->buf_out_size); a_esocket->flags |= DAP_SOCK_SIGNAL_CLOSE; a_esocket->buf_in_size = a_esocket->buf_out_size = 0; // Reset everything from buffer, we close it now all @@ -1628,7 +1628,7 @@ void dap_events_socket_set_readable_unsafe( dap_events_socket_t *a_esocket, bool l_errbuf[0]=0; strerror_r(l_errno, l_errbuf, sizeof (l_errbuf)); if (l_errno == EBADF){ - log_it(L_ATT,"Set readable: socket %d (%p ) disconnected, rise CLOSE flag to remove from queue, lost %"DAP_UINT64_FORMAT_u":%" DAP_UINT64_FORMAT_u + log_it(L_ATT,"Set readable: socket %d (%p ) disconnected, rise CLOSE flag to remove from queue, lost %"DAP_UINT64_FORMAT_U":%" DAP_UINT64_FORMAT_U " bytes",a_esocket->socket,a_esocket,a_esocket->buf_in_size,a_esocket->buf_out_size); a_esocket->flags |= DAP_SOCK_SIGNAL_CLOSE; a_esocket->buf_in_size = a_esocket->buf_out_size = 0; // Reset everything from buffer, we close it now all @@ -1696,7 +1696,7 @@ void dap_events_socket_set_writable_unsafe( dap_events_socket_t *a_esocket, bool l_errbuf[0]=0; strerror_r(l_errno, l_errbuf, sizeof (l_errbuf)); if (l_errno == EBADF){ - log_it(L_ATT,"Set writable: socket %d (%p ) disconnected, rise CLOSE flag to remove from queue, lost %"DAP_UINT64_FORMAT_u":%" DAP_UINT64_FORMAT_u + log_it(L_ATT,"Set writable: socket %d (%p ) disconnected, rise CLOSE flag to remove from queue, lost %"DAP_UINT64_FORMAT_U":%" DAP_UINT64_FORMAT_U " bytes",a_esocket->socket,a_esocket,a_esocket->buf_in_size,a_esocket->buf_out_size); a_esocket->flags |= DAP_SOCK_SIGNAL_CLOSE; a_esocket->buf_in_size = a_esocket->buf_out_size = 0; // Reset everything from buffer, we close it now all @@ -1916,7 +1916,7 @@ void dap_events_socket_remove_and_delete_mt(dap_worker_t * a_w, dap_events_sock *l_es_uuid_ptr = a_es_uuid; if(dap_events_socket_queue_ptr_send( a_w->queue_es_delete, l_es_uuid_ptr ) != 0 ){ - log_it(L_ERROR,"Can't send %"DAP_UINT64_FORMAT_u" uuid in queue",a_es_uuid); + log_it(L_ERROR,"Can't send %"DAP_UINT64_FORMAT_U" uuid in queue",a_es_uuid); DAP_DELETE(l_es_uuid_ptr); } } diff --git a/dap-sdk/net/core/dap_worker.c b/dap-sdk/net/core/dap_worker.c index ec61abc40f5f0d4c6cc64c4b9af8a54805c0d1e2..d5bc300af0f09945762aae7b3728b1cd64c8a902 100644 --- a/dap-sdk/net/core/dap_worker.c +++ b/dap-sdk/net/core/dap_worker.c @@ -982,7 +982,7 @@ static void s_queue_delete_es_callback( dap_events_socket_t * a_es, void * a_arg //l_es->flags |= DAP_SOCK_SIGNAL_CLOSE; // Send signal to socket to kill dap_events_socket_remove_and_delete_unsafe(l_es,false); }else - log_it(L_INFO, "While we were sending the delete() message, esocket %"DAP_UINT64_FORMAT_u" has been disconnected ", l_es_uuid_ptr); + log_it(L_INFO, "While we were sending the delete() message, esocket %"DAP_UINT64_FORMAT_U" has been disconnected ", l_es_uuid_ptr); DAP_DELETE(l_es_uuid_ptr); } diff --git a/dap-sdk/net/server/http_server/http_client/dap_http_client.c b/dap-sdk/net/server/http_server/http_client/dap_http_client.c index f3bbcc5f9330b3ba73d43dec4cd1057f22e8d3af..9ddf256b080cc3567c8bab71eca0fc5669e4035e 100644 --- a/dap-sdk/net/server/http_server/http_client/dap_http_client.c +++ b/dap-sdk/net/server/http_server/http_client/dap_http_client.c @@ -647,9 +647,9 @@ void dap_http_client_out_header_generate(dap_http_client_t *a_http_client) log_it(L_DEBUG,"output: Content-Type = '%s'",a_http_client->out_content_type); } if ( a_http_client->out_content_length ) { - dap_snprintf(buf,sizeof(buf),"%"DAP_UINT64_FORMAT_u"",a_http_client->out_content_length); + dap_snprintf(buf,sizeof(buf),"%"DAP_UINT64_FORMAT_U"",a_http_client->out_content_length); dap_http_header_add(&a_http_client->out_headers,"Content-Length",buf); - log_it(L_DEBUG,"output: Content-Length = %"DAP_UINT64_FORMAT_u"",a_http_client->out_content_length); + log_it(L_DEBUG,"output: Content-Length = %"DAP_UINT64_FORMAT_U"",a_http_client->out_content_length); } }else if (s_debug_http) diff --git a/modules/chain/dap_chain.c b/modules/chain/dap_chain.c index 812901cf829b0c6bea89b451cc77a7a256664b83..54f48db0781a2dc516e69d03a6f1b7d18369583e 100644 --- a/modules/chain/dap_chain.c +++ b/modules/chain/dap_chain.c @@ -300,7 +300,7 @@ dap_chain_t * dap_chain_load_from_cfg(dap_ledger_t* a_ledger, const char * a_cha if ( (l_chain_id_str = dap_config_get_item_str(l_cfg,"chain","id")) != NULL ){ if ( sscanf(l_chain_id_str,"0x%"DAP_UINT64_FORMAT_X,& l_chain_id_u ) !=1 ){ if ( sscanf(l_chain_id_str,"0x%"DAP_UINT64_FORMAT_x,&l_chain_id_u) !=1 ) { - if ( sscanf(l_chain_id_str,"%"DAP_UINT64_FORMAT_u,&l_chain_id_u ) !=1 ){ + if ( sscanf(l_chain_id_str,"%"DAP_UINT64_FORMAT_U,&l_chain_id_u ) !=1 ){ log_it (L_ERROR,"Can't recognize '%s' string as chain net id, hex or dec",l_chain_id_str); dap_config_close(l_cfg); return NULL; diff --git a/modules/channel/chain/dap_stream_ch_chain.c b/modules/channel/chain/dap_stream_ch_chain.c index 86a353e7ec4526bdfec864dab5b2ab82b325b934..89eab836b1cafdffe95d990c09ce602d5fb4b5d8 100644 --- a/modules/channel/chain/dap_stream_ch_chain.c +++ b/modules/channel/chain/dap_stream_ch_chain.c @@ -396,7 +396,7 @@ static bool s_sync_out_gdb_proc_callback(dap_proc_thread_t *a_thread, void *a_ar if(l_db_log) { if (s_debug_more) - log_it(L_DEBUG, "Sync out gdb proc, requested %"DAP_UINT64_FORMAT_u" transactions from address "NODE_ADDR_FP_STR, + log_it(L_DEBUG, "Sync out gdb proc, requested %"DAP_UINT64_FORMAT_U" transactions from address "NODE_ADDR_FP_STR, l_db_log->items_number, NODE_ADDR_FP_ARGS_S(l_sync_request->request.node_addr)); l_sync_request->gdb.db_log = l_db_log; dap_proc_thread_worker_exec_callback(a_thread, l_sync_request->worker->id, s_sync_out_gdb_first_worker_callback, l_sync_request ); @@ -1365,7 +1365,7 @@ void s_stream_ch_packet_out(dap_stream_ch_t* a_ch, void* a_arg) l_ch_chain->request_hdr.net_id.uint64, l_ch_chain->request_hdr.chain_id.uint64, l_ch_chain->request_hdr.cell_id.uint64, NULL, 0); } else { - log_it( L_INFO,"Syncronized database: items syncronyzed %"DAP_UINT64_FORMAT_u" from %"DAP_UINT64_FORMAT_u"", + log_it( L_INFO,"Syncronized database: items syncronyzed %"DAP_UINT64_FORMAT_U" from %"DAP_UINT64_FORMAT_U"", l_ch_chain->stats_request_gdb_processed, dap_db_log_list_get_count(l_ch_chain->request_db_log)); // last message dap_stream_ch_chain_sync_request_t l_request = {}; @@ -1477,7 +1477,7 @@ void s_stream_ch_packet_out(dap_stream_ch_t* a_ch, void* a_arg) dap_stream_ch_chain_pkt_write_unsafe(a_ch, DAP_STREAM_CH_CHAIN_PKT_TYPE_SYNCED_CHAINS, l_ch_chain->request_hdr.net_id.uint64, l_ch_chain->request_hdr.chain_id.uint64, l_ch_chain->request_hdr.cell_id.uint64, &l_request, sizeof(l_request)); - log_it( L_INFO,"Synced: %"DAP_UINT64_FORMAT_u" atoms processed", l_ch_chain->stats_request_atoms_processed); + log_it( L_INFO,"Synced: %"DAP_UINT64_FORMAT_U" atoms processed", l_ch_chain->stats_request_atoms_processed); dap_stream_ch_chain_go_idle(l_ch_chain); if (l_ch_chain->callback_notify_packet_out) l_ch_chain->callback_notify_packet_out(l_ch_chain, DAP_STREAM_CH_CHAIN_PKT_TYPE_SYNCED_CHAINS, NULL, diff --git a/modules/global-db/dap_chain_global_db_remote.c b/modules/global-db/dap_chain_global_db_remote.c index 8075026a12d0dd7fc54ecb491d1a546d9b1b0f3d..63be1fe953fa04c37e72e77aa7179ad3c236d2df 100644 --- a/modules/global-db/dap_chain_global_db_remote.c +++ b/modules/global-db/dap_chain_global_db_remote.c @@ -104,7 +104,7 @@ uint64_t dap_db_get_cur_node_addr(char *a_net_name) */ bool dap_db_set_last_id_remote(uint64_t a_node_addr, uint64_t a_id, char *a_group) { - //log_it( L_DEBUG, "Node 0x%016X set last synced id %"DAP_UINT64_FORMAT_u"", a_node_addr, a_id); + //log_it( L_DEBUG, "Node 0x%016X set last synced id %"DAP_UINT64_FORMAT_U"", a_node_addr, a_id); char *l_node_addr_str = dap_strdup_printf("%ju%s", a_node_addr, a_group); bool l_ret = dap_chain_global_db_gr_set(l_node_addr_str, &a_id, sizeof(uint64_t), GROUP_LOCAL_NODE_LAST_ID); diff --git a/modules/net/dap_chain_node_cli_cmd_tx.c b/modules/net/dap_chain_node_cli_cmd_tx.c index 5f87af7f8562bba2934c1032f3dda4efd6a596fb..068e57f56f99ef1606c33584c4f524a35aa518c2 100644 --- a/modules/net/dap_chain_node_cli_cmd_tx.c +++ b/modules/net/dap_chain_node_cli_cmd_tx.c @@ -129,7 +129,7 @@ void _dap_chain_datum_tx_out_data(dap_chain_datum_tx_t *a_datum, break; case TX_ITEM_TYPE_OUT: dap_string_append_printf(a_str_out, "\t OUT:\n" - "\t\t Value: %s (%"DAP_UINT64_FORMAT_u")\n" + "\t\t Value: %s (%"DAP_UINT64_FORMAT_U")\n" "\t\t Address: %s\n", dap_chain_balance_to_coins(dap_chain_uint128_from( ((dap_chain_tx_out_t*)item)->header.value) @@ -177,7 +177,7 @@ void _dap_chain_datum_tx_out_data(dap_chain_datum_tx_t *a_datum, "\t\t\t units: 0x%016"DAP_UINT64_FORMAT_x"\n" "\t\t\t uid: 0x%016"DAP_UINT64_FORMAT_x"\n" "\t\t\t units type: %s \n" - "\t\t\t value: %s (%"DAP_UINT64_FORMAT_u")\n", + "\t\t\t value: %s (%"DAP_UINT64_FORMAT_U")\n", ((dap_chain_datum_tx_receipt_t*)item)->size, ((dap_chain_datum_tx_receipt_t*)item)->exts_size, ((dap_chain_datum_tx_receipt_t*)item)->receipt_info.units, @@ -245,7 +245,7 @@ void _dap_chain_datum_tx_out_data(dap_chain_datum_tx_t *a_datum, dap_string_append_printf(a_str_out, "\t OUT COND:\n" "\t Header:\n" "\t\t\t ts_expires: %s\t" - "\t\t\t value: %s (%"DAP_UINT64_FORMAT_u")\n" + "\t\t\t value: %s (%"DAP_UINT64_FORMAT_U")\n" "\t\t\t subtype: %s\n" "\t\t SubType:\n", dap_ctime_r((time_t*)((dap_chain_tx_out_cond_t*)item)->header.ts_expires, l_tmp_buf), @@ -260,7 +260,7 @@ void _dap_chain_datum_tx_out_data(dap_chain_datum_tx_t *a_datum, dap_string_append_printf(a_str_out, "\t\t\t unit: 0x%08x\n" "\t\t\t uid: 0x%016"DAP_UINT64_FORMAT_x"\n" "\t\t\t pkey: %s\n" - "\t\t\t max price: %s (%"DAP_UINT64_FORMAT_u") \n", + "\t\t\t max price: %s (%"DAP_UINT64_FORMAT_U") \n", ((dap_chain_tx_out_cond_t*)item)->subtype.srv_pay.unit.uint32, ((dap_chain_tx_out_cond_t*)item)->subtype.srv_pay.srv_uid.uint64, l_hash_str_tmp, @@ -284,7 +284,7 @@ void _dap_chain_datum_tx_out_data(dap_chain_datum_tx_t *a_datum, dap_string_append_printf(a_str_out, "\t\t\t uid: 0x%016"DAP_UINT64_FORMAT_x"\n" "\t\t\t net id: 0x%016"DAP_UINT64_FORMAT_x"\n" "\t\t\t token: %s\n" - "\t\t\t value: %s (%"DAP_UINT64_FORMAT_u")\n", + "\t\t\t value: %s (%"DAP_UINT64_FORMAT_U")\n", ((dap_chain_tx_out_cond_t*)item)->subtype.srv_xchange.srv_uid.uint64, ((dap_chain_tx_out_cond_t*)item)->subtype.srv_xchange.net_id.uint64, ((dap_chain_tx_out_cond_t*)item)->subtype.srv_xchange.token, @@ -301,7 +301,7 @@ void _dap_chain_datum_tx_out_data(dap_chain_datum_tx_t *a_datum, dap_string_append_printf(a_str_out, "\t OUT EXT:\n" "\t\t Addr: %s\n" "\t\t Token: %s\n" - "\t\t Value: %s (%"DAP_UINT64_FORMAT_u")\n", + "\t\t Value: %s (%"DAP_UINT64_FORMAT_U")\n", dap_chain_addr_to_str(&((dap_chain_tx_out_ext_t*)item)->addr), ((dap_chain_tx_out_ext_t*)item)->token, dap_chain_balance_to_coins(dap_chain_uint128_from(