diff --git a/CMakeLists.txt b/CMakeLists.txt index 76196911229b5328d95dcd9e69a8cb8d23cf7c87..b784d63bd7a36cc5ce65118408731fd3214dd35f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,8 +51,8 @@ SET(DESTDIR "/opt/${PROJECT_NAME}") SET( CPACK_GENERATOR "DEB") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_VERSION_MAJOR 1) -SET( CPACK_PACKAGE_VERSION_MINOR 0) -SET( CPACK_PACKAGE_VERSION_PATCH 2) +SET( CPACK_PACKAGE_VERSION_MINOR 1) +SET( CPACK_PACKAGE_VERSION_PATCH 1) SET( CPACK_SYSTEM_NAME "debian-10.0-amd64") SET( CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}-${CPACK_PACKAGE_VERSION_PATCH}") @@ -60,7 +60,7 @@ SET( CPACK_DEBIAN_PACKAGE_MAINTAINER "Dmitriy Gerasimov <naeper@demlabs.net>" ) SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION_SUMMARY "DapCash Node software https://dapcash.org" ) SET( CPACK_DEBIAN_PACKAGE_DESCRIPTION "DapCash Node" ) SET( CPACK_DEBIAN_PACKAGE_SECTION "extra") -SET( CPACK_DEBIAN_PACKAGE_DEPENDS "debconf (>=1.5), dpkg (>=1.17), bash (>=4), debconf-utils, dconf-cli, less, pv, psmisc") +SET( CPACK_DEBIAN_PACKAGE_DEPENDS "debconf (>=1.5), dpkg (>=1.17), bash (>=4), debconf-utils, dconf-cli, less, pv, psmisc, procps") SET( CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) SET( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/debian/postinst;${CMAKE_CURRENT_SOURCE_DIR}/debian/postrm;${CMAKE_CURRENT_SOURCE_DIR}/debian/templates;${CMAKE_CURRENT_SOURCE_DIR}/debian/config;") diff --git a/debian/postinst b/debian/postinst index b8637229b7aa57e6d34f2eeccd6ddd462c9591cc..fdd0e1ffb37b16b18355c3878ce61c63a7a1e4fc 100755 --- a/debian/postinst +++ b/debian/postinst @@ -71,7 +71,7 @@ mkdir -p $DAP_PREFIX/var/log || true cat /etc/passwd| grep dapcash-node || adduser --system --no-create-home --group --home /opt/dapcash-node dapcash-node echo "[*] Check /etc/systemd/system/$DAP_APP_NAME.service file..." -if [ -f /etc/systemd/system/$DAP_APP_NAME.service ]; then +if [ -h /etc/systemd/system/$DAP_APP_NAME.service ]; then echo "[*] Restarting $DAP_APP_NAME to implement changes" systemctl --system stop $DAP_APP_NAME >> /dev/null|| true systemctl daemon-reload || true @@ -100,5 +100,6 @@ else fi done chmod 0774 $DAP_PREFIX/bin/* + systemctl --system start $DAP_APP_NAME || true echo "[*] Done" fi diff --git a/debian/templates b/debian/templates index 4762ad96b7265fdcc840db065a84bc7ec7f21c19..fccc437c618e1f1b0a3609293de080cdeaf66c76 100755 --- a/debian/templates +++ b/debian/templates @@ -27,10 +27,10 @@ Description: Accept connections Accept connections Template: dapcash-node/server_port -Default: 8079 +Default: 8089 Type: string Description: Server port - Server port to listen on, recomended 8079 + Server port to listen on, recomended 8089 Template: dapcash-node/server_addr Default: 0.0.0.0 @@ -38,7 +38,6 @@ Type: string Description: Server address Server address to listen on - Template: dapcash-node/dapcash_testnet_enabled Default: true Choices: true, false diff --git a/dist/etc/network/kelvin-testnet/chain-0.cfg b/dist/etc/network/kelvin-testnet/chain-0.cfg index c55fc271b8bd74583db68b1cc386194fa7cabfd6..c3b23117beb6912f29b1ac8ccd58f2de79397f35 100644 --- a/dist/etc/network/kelvin-testnet/chain-0.cfg +++ b/dist/etc/network/kelvin-testnet/chain-0.cfg @@ -7,9 +7,8 @@ load_priority=1 datum_types=[token,emission,shard,ca] consensus=dag_poa - [files] -storage_dir=/opt/dapcash-node/var/lib/network/kelvin-testnet/zerochain/ +storage_dir=/opt/cellframe-node/var/lib/network/kelvin-testnet/zerochain/ [dag] is_single_line=true @@ -26,4 +25,4 @@ static_genesis_event=0xEB2152E716245D067BEA80E8CB6D7C35859B2E0E91AF4201486BB443F auth_certs_prefix=kelvin.testnet.root auth_certs_number=5 auth_certs_number_verify=1 #4 -auth_certs_dir=/opt/dapcash-node/share/ca +auth_certs_dir=/opt/cellframe-node/share/ca diff --git a/libdap b/libdap index a479b3c1e56ece208e00c7a75a0cf656e6310dbb..1e2a856513089e62f17d827398c74ed9848b5a4d 160000 --- a/libdap +++ b/libdap @@ -1 +1 @@ -Subproject commit a479b3c1e56ece208e00c7a75a0cf656e6310dbb +Subproject commit 1e2a856513089e62f17d827398c74ed9848b5a4d diff --git a/libdap-app-cli b/libdap-app-cli index 1e888729d80befec68683762707e62b8e61d2a4d..9d07e70b9e0260f578d179260da3e20e1c691d00 160000 --- a/libdap-app-cli +++ b/libdap-app-cli @@ -1 +1 @@ -Subproject commit 1e888729d80befec68683762707e62b8e61d2a4d +Subproject commit 9d07e70b9e0260f578d179260da3e20e1c691d00 diff --git a/libdap-chain b/libdap-chain index d591e36646bc90ae433b3090626ae9d52882814b..aa95a9117e7491c6543e30dd8482738277c63141 160000 --- a/libdap-chain +++ b/libdap-chain @@ -1 +1 @@ -Subproject commit d591e36646bc90ae433b3090626ae9d52882814b +Subproject commit aa95a9117e7491c6543e30dd8482738277c63141 diff --git a/libdap-chain-crypto b/libdap-chain-crypto index 1248013aff1bbde72e92d20e9c13225ab11b2b16..8adfc9ceb403d4cf708717165c24cbd1c6a6d830 160000 --- a/libdap-chain-crypto +++ b/libdap-chain-crypto @@ -1 +1 @@ -Subproject commit 1248013aff1bbde72e92d20e9c13225ab11b2b16 +Subproject commit 8adfc9ceb403d4cf708717165c24cbd1c6a6d830 diff --git a/libdap-chain-cs-dag b/libdap-chain-cs-dag index 080fee36472e800c5d3db1bea46b5de90d91e0db..f6287f462901f2c2f2c53208c7bd0c89fbbd9761 160000 --- a/libdap-chain-cs-dag +++ b/libdap-chain-cs-dag @@ -1 +1 @@ -Subproject commit 080fee36472e800c5d3db1bea46b5de90d91e0db +Subproject commit f6287f462901f2c2f2c53208c7bd0c89fbbd9761 diff --git a/libdap-chain-cs-dag-poa b/libdap-chain-cs-dag-poa index 6a56f7c0f6d9c618f98a053ad7701476c529ed2c..2dd7714e19e143167f4b07ae1bb42e03147cd774 160000 --- a/libdap-chain-cs-dag-poa +++ b/libdap-chain-cs-dag-poa @@ -1 +1 @@ -Subproject commit 6a56f7c0f6d9c618f98a053ad7701476c529ed2c +Subproject commit 2dd7714e19e143167f4b07ae1bb42e03147cd774 diff --git a/libdap-chain-cs-dag-pos b/libdap-chain-cs-dag-pos index 25a1256e47a85854e143c540fbabc8dc3fe1f7ae..6db0307c14874486454c3c48fd0f6b07b9400e94 160000 --- a/libdap-chain-cs-dag-pos +++ b/libdap-chain-cs-dag-pos @@ -1 +1 @@ -Subproject commit 25a1256e47a85854e143c540fbabc8dc3fe1f7ae +Subproject commit 6db0307c14874486454c3c48fd0f6b07b9400e94 diff --git a/libdap-chain-global-db b/libdap-chain-global-db index ef72e3e95eea97d1a17f66c35d184a2ed02e6854..9c4be41c7bc92f640b1774f9d1b13e64b4537e4d 160000 --- a/libdap-chain-global-db +++ b/libdap-chain-global-db @@ -1 +1 @@ -Subproject commit ef72e3e95eea97d1a17f66c35d184a2ed02e6854 +Subproject commit 9c4be41c7bc92f640b1774f9d1b13e64b4537e4d diff --git a/libdap-chain-mempool b/libdap-chain-mempool index ee7139d8f6cb50122334b5edbe0d5a02aca367d6..b69d7b0b39f661d682df90c180a923cf50a48942 160000 --- a/libdap-chain-mempool +++ b/libdap-chain-mempool @@ -1 +1 @@ -Subproject commit ee7139d8f6cb50122334b5edbe0d5a02aca367d6 +Subproject commit b69d7b0b39f661d682df90c180a923cf50a48942 diff --git a/libdap-chain-net b/libdap-chain-net index aa8df1441323850017d0ed5117e6d5e254225054..c9a9428b16cb55fc4071ed957a801692a4b601c1 160000 --- a/libdap-chain-net +++ b/libdap-chain-net @@ -1 +1 @@ -Subproject commit aa8df1441323850017d0ed5117e6d5e254225054 +Subproject commit c9a9428b16cb55fc4071ed957a801692a4b601c1 diff --git a/libdap-chain-net-srv b/libdap-chain-net-srv index 979a6477d4c30346db2ff2144b4009fb0b7fc8d4..6b8faba4c5ed9ea1831429797e4b1115b966edd7 160000 --- a/libdap-chain-net-srv +++ b/libdap-chain-net-srv @@ -1 +1 @@ -Subproject commit 979a6477d4c30346db2ff2144b4009fb0b7fc8d4 +Subproject commit 6b8faba4c5ed9ea1831429797e4b1115b966edd7 diff --git a/libdap-chain-wallet b/libdap-chain-wallet index 4a3ca1c4e8799f38cd1adb792f117bfe3027b0c0..03c5b590d7548b73ad739a1718adc20cfceee1d9 160000 --- a/libdap-chain-wallet +++ b/libdap-chain-wallet @@ -1 +1 @@ -Subproject commit 4a3ca1c4e8799f38cd1adb792f117bfe3027b0c0 +Subproject commit 03c5b590d7548b73ad739a1718adc20cfceee1d9 diff --git a/libdap-client b/libdap-client index f7dbe9db19e6f87c6fe5bb5abf004cde162ed3dd..e1e44eac7b182425f3df380d116d0a4ee461ae41 160000 --- a/libdap-client +++ b/libdap-client @@ -1 +1 @@ -Subproject commit f7dbe9db19e6f87c6fe5bb5abf004cde162ed3dd +Subproject commit e1e44eac7b182425f3df380d116d0a4ee461ae41 diff --git a/libdap-crypto b/libdap-crypto index d30f7681997fd3f1126d667ae36674521c79a329..1d79ffc6a05da7b4d561509647ee00e66e4c537c 160000 --- a/libdap-crypto +++ b/libdap-crypto @@ -1 +1 @@ -Subproject commit d30f7681997fd3f1126d667ae36674521c79a329 +Subproject commit 1d79ffc6a05da7b4d561509647ee00e66e4c537c diff --git a/libdap-server b/libdap-server index e0a801fa196542d57ef7482b4aba0ac82e7eecd3..03c530cc6090306df31c2b6ca9db62ae20f26869 160000 --- a/libdap-server +++ b/libdap-server @@ -1 +1 @@ -Subproject commit e0a801fa196542d57ef7482b4aba0ac82e7eecd3 +Subproject commit 03c530cc6090306df31c2b6ca9db62ae20f26869 diff --git a/libdap-server-core b/libdap-server-core index 9fdcdcb45d041e63a3a4b575424a6f3de7e68ca1..a7c704ee74d0955e1ff03e5fa9cebb2d6a7f5be4 160000 --- a/libdap-server-core +++ b/libdap-server-core @@ -1 +1 @@ -Subproject commit 9fdcdcb45d041e63a3a4b575424a6f3de7e68ca1 +Subproject commit a7c704ee74d0955e1ff03e5fa9cebb2d6a7f5be4 diff --git a/libdap-server-udp b/libdap-server-udp index 608ab1c9e0f5dac7b8c4f1abac6aa8f13c48ceaa..ada7448ce8e6688101470f099bbef79e915e8d9d 160000 --- a/libdap-server-udp +++ b/libdap-server-udp @@ -1 +1 @@ -Subproject commit 608ab1c9e0f5dac7b8c4f1abac6aa8f13c48ceaa +Subproject commit ada7448ce8e6688101470f099bbef79e915e8d9d diff --git a/libdap-stream b/libdap-stream index 4528b31243af178fb981c5caeec5e281fb6e9b82..a4dda122735ad7ff8523d1f53b5e22696fe93d32 160000 --- a/libdap-stream +++ b/libdap-stream @@ -1 +1 @@ -Subproject commit 4528b31243af178fb981c5caeec5e281fb6e9b82 +Subproject commit a4dda122735ad7ff8523d1f53b5e22696fe93d32 diff --git a/libdap-stream-ch b/libdap-stream-ch index ad0f3e360023e023cd5cfa312db2dd3c441f8b66..d911a60b20ec760d4938615dd8cc01d5c2955196 160000 --- a/libdap-stream-ch +++ b/libdap-stream-ch @@ -1 +1 @@ -Subproject commit ad0f3e360023e023cd5cfa312db2dd3c441f8b66 +Subproject commit d911a60b20ec760d4938615dd8cc01d5c2955196 diff --git a/libdap-stream-ch-chain b/libdap-stream-ch-chain index 5d522e3397528df51809bca9143a978d2fe62143..cb821ebd8a4663a086cdcf47e7c94217799ff054 160000 --- a/libdap-stream-ch-chain +++ b/libdap-stream-ch-chain @@ -1 +1 @@ -Subproject commit 5d522e3397528df51809bca9143a978d2fe62143 +Subproject commit cb821ebd8a4663a086cdcf47e7c94217799ff054 diff --git a/libdap-stream-ch-chain-net b/libdap-stream-ch-chain-net index 5ffbfcbd2a475b252938bdd1c793dc7c612b105d..ffa9839387f4c58dc65efa75ee1b5fde15273a2e 160000 --- a/libdap-stream-ch-chain-net +++ b/libdap-stream-ch-chain-net @@ -1 +1 @@ -Subproject commit 5ffbfcbd2a475b252938bdd1c793dc7c612b105d +Subproject commit ffa9839387f4c58dc65efa75ee1b5fde15273a2e diff --git a/libdap-stream-ch-chain-net-srv b/libdap-stream-ch-chain-net-srv index 26b14c86f7008d44086ef8cf72b4ba780462dbc2..37715497f476cab7717e88f851f2872e64291cbd 160000 --- a/libdap-stream-ch-chain-net-srv +++ b/libdap-stream-ch-chain-net-srv @@ -1 +1 @@ -Subproject commit 26b14c86f7008d44086ef8cf72b4ba780462dbc2 +Subproject commit 37715497f476cab7717e88f851f2872e64291cbd