diff --git a/CMakeLists.txt b/CMakeLists.txt index 458192d231022b6355abeb135ada13f51d2dc843..54ff38d54442b52700087c0b47aa850ab537ca99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_C_STANDARD 11) SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 4) SET( CPACK_PACKAGE_VERSION_MINOR 3) -SET( CPACK_PACKAGE_VERSION_PATCH 4) +SET( CPACK_PACKAGE_VERSION_PATCH 5) # # init CellFrame SDK @@ -18,9 +18,9 @@ add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}-${CPACK_PACKAGE_ set(SUBMODULES_NO_BUILD ON) if (NOT(WIN32)) - set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn") + set(CELLFRAME_MODULES "core chains mining network srv cs-blocks cs-dag-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic srv-vpn") else() - set(CELLFRAME_MODULES "core chains mining network srv cs-dag-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic") + set(CELLFRAME_MODULES "core chains mining network srv cs-blocks cs-dag-poa cs-block-poa cs-dag-pos cs-none srv-app srv-app-db srv-datum srv-stake srv-xchange modules-dynamic") endif() include (cellframe-sdk/cmake/OS_Detection.cmake) diff --git a/cellframe-sdk b/cellframe-sdk index a1db0f74841909bc447c10f2f4cbb3c2186152f9..78b20a43c8f330c4b73c73037282ab92f7173bdd 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit a1db0f74841909bc447c10f2f4cbb3c2186152f9 +Subproject commit 78b20a43c8f330c4b73c73037282ab92f7173bdd diff --git a/dist/share/configs/dapcash-node.cfg.tpl b/dist/share/configs/dapcash-node.cfg.tpl index 79b7744af88efff17e93e0e54f81f672beefdecc..6a922f898b540bd779a625a1a6773dba0ab7c60e 100644 --- a/dist/share/configs/dapcash-node.cfg.tpl +++ b/dist/share/configs/dapcash-node.cfg.tpl @@ -4,8 +4,6 @@ debug_mode={DEBUG_MODE} # Debug stream packets debug_dump_stream_headers=false -# Debug chains syncronyzation -debug_chain_sync=false # Debug I/O reactor, false by default #debug_reactor=false @@ -61,6 +59,16 @@ pricelist=[] # How often rerun network state check sequence, in seconds. 180 by default net_check_timeout=10 net_sync_timeout=180 +debug_more=true +# Timeout for network status wait +status_wait_timeout=10 + +[stream_ch_chain] +# Uncomment to have more debug information in stream channel Chain +# False by default +#debug_more=true + + # Central Dataase [cdb] diff --git a/python-cellframe b/python-cellframe index 4556354b985bef5083d949c2dae50a7c4bd1f3d5..5f7f50045b26904da1cce15ab349c97d70e767bb 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 4556354b985bef5083d949c2dae50a7c4bd1f3d5 +Subproject commit 5f7f50045b26904da1cce15ab349c97d70e767bb