diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c95558e6363bf27ec01cdda39a6d5ee8c82384a..5660f6914db332a40ecdbcbc1cd73834d86d900d 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 4) -SET( CPACK_PACKAGE_VERSION_PATCH 9) +SET( CPACK_PACKAGE_VERSION_PATCH 10) # init CellFrame SDK add_definitions("-DDAP_VERSION=\"${CPACK_PACKAGE_VERSION_MAJOR}-${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\"") @@ -19,7 +19,7 @@ if(BUILD_WITH_GDB_DRIVER_MDBX) add_subdirectory(3rdparty/libmdbx) endif() -if((LINUX)) +if(LINUX) set(SUPPORT_PYTHON_PLUGINS ON) endif() diff --git a/cellframe-sdk b/cellframe-sdk index 318c24596f43f3b5b8ab854858f0749c55c7547a..df3c430a13ce9b0452594c105ef4e87bc0d18641 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 318c24596f43f3b5b8ab854858f0749c55c7547a +Subproject commit df3c430a13ce9b0452594c105ef4e87bc0d18641 diff --git a/dist.linux/share/configs/network/core-t.cfg.tpl b/dist.linux/share/configs/network/core-t.cfg.tpl deleted file mode 100644 index 8bbde617fcdb5a95cd5698122d5870a85d62d992..0000000000000000000000000000000000000000 --- a/dist.linux/share/configs/network/core-t.cfg.tpl +++ /dev/null @@ -1,23 +0,0 @@ -# Core testnet -# General section -[general] -id=0xffffffffffffffff -name=core-t -# Possible values: light, full, archive, master, root -node-role={NODE_TYPE} -node_addr_type=auto -seed_nodes_hostnames=[159.89.52.250,167.172.35.90,104.248.41.92] -seed_nodes_aliases=[core-t.root.0,core-t.root.1,core-t.root.2] -seed_nodes_addrs=[0000::0000::0000::0001,0000::0000::0000::0002,0000::0000::0000::0003] -seed_nodes_port=[80,80,80] - - -#[role-master] -#proc_chains=[0x00000001] - -#[dag-poa] -#events-sign-cert=mycert - -#[dag-pos] -#events-sign-wallet=mywallet - diff --git a/dist.linux/share/configs/network/kelvin-testnet.cfg.tpl b/dist.linux/share/configs/network/kelvin-testnet.cfg.tpl deleted file mode 100644 index 7b899786c9d2d3fe3cc80bf93815244c016392f4..0000000000000000000000000000000000000000 --- a/dist.linux/share/configs/network/kelvin-testnet.cfg.tpl +++ /dev/null @@ -1,30 +0,0 @@ -# Kelvin Testnet -# General section -[general] -id=0x0000000000000001 -name=kelvin-testnet -# Possible values: light, full, archive, master, root -node-role={NODE_TYPE} - -seed_nodes_hostnames=[0.root.testnet.klvn.io,1.root.testnet.klvn.io,2.root.testnet.klvn.io,3.root.testnet.klvn.io,4.root.testnet.klvn.io] -seed_nodes_aliases=[kelvin.testnet.root.0,kelvin.testnet.root.1,kelvin.testnet.root.2,kelvin.testnet.root.3,kelvin.testnet.root.4] -seed_nodes_addrs=[ffff::0000::0000::0001,ffff::0000::0000::0002,ffff::0000::0000::0003,ffff::0000::0000::0004,ffff::0000::0000::0005] -seed_nodes_port=[8079,8079,8079,8079,8079] - -private=false - -#[auth] -#type=ca -#acl_accept_ca_list=[] -#acl_accept_ca_gdb= -#acl_accept_ca_chains=all - -#[role-master] -#proc_chains=[0x00000001] - -#[dag-poa] -#events-sign-cert=mycert - -#[dag-pos] -#events-sign-wallet=mywallet - diff --git a/dist.linux/share/configs/network/private.cfg.tpl b/dist.linux/share/configs/network/private.cfg.tpl deleted file mode 100644 index 3622ae20036c9fb1daa7e16ec5dba51131c38227..0000000000000000000000000000000000000000 --- a/dist.linux/share/configs/network/private.cfg.tpl +++ /dev/null @@ -1,25 +0,0 @@ -# Kelvin Blockchain: development network -# General section -[general] -id=0xFF00000000000001 -name=private -# Possible values: light, full, archive, master, root -node-role={NODE_TYPE} -gdb_groups_prefix=my-private -#node-alias=addr-%node_addr% -#node-addr=0x10 -# node addr exired time in hours (168h=1w 720h=1m 8760h=1y), by default 720h(1week) -# node-addr-expired=168 -# type of node addr [auto, static, dinamic] -node_addr_type=auto - -seed_nodes_ipv4=[195.154.133.160, 62.210.90.227] -seed_nodes_port=[8079, 8079] -seed_nodes_aliases=[kelvin.testnet.root.0,kelvin.testnet.root.1] -seed_nodes_addrs=[ffff::0000::0000::0001,ffff::0000::0000::0002] - -#[dag-poa] -#events-sign-cert=mycert - -#[dag-pos] -#events-sign-wallet=mywallet diff --git a/dist.linux/share/configs/cellframe-node.cfg.tpl b/dist/share/configs/cellframe-node.cfg.tpl similarity index 82% rename from dist.linux/share/configs/cellframe-node.cfg.tpl rename to dist/share/configs/cellframe-node.cfg.tpl index 55c3d481b691679802ce7ac0070a5f4a3e4405c4..fce6ce9e687261deae7e63c1a13d535fcddbfad6 100644 --- a/dist.linux/share/configs/cellframe-node.cfg.tpl +++ b/dist/share/configs/cellframe-node.cfg.tpl @@ -93,7 +93,7 @@ pricelist=[cellframe-testnet:100:KELT:3600:SEC:mywallet0] [conserver] enabled=true #listen_port_tcp=12345 -listen_unix_socket_path=/opt/cellframe-node/var/run/node_cli +listen_unix_socket_path={PREFIX}/var/run/node_cli # Default permissions 770 #listen_unix_socket_permissions=770 @@ -101,17 +101,17 @@ listen_unix_socket_path=/opt/cellframe-node/var/run/node_cli [resources] # 0 means auto detect threads_cnt=0 -# By default notify opens at /tmp/cellframe-node-notify -#notify_path=/home/myuser/cellframe-node-notify +# By default notify opens at {PREFIX}/var/run/node_notify +notify_path={PREFIX}/var/run/node_notify #notify_permissions=770 #notify_user=myuser #notify_group=mygroup -pid_path=/opt/cellframe-node/var/run/cellframe-node.pid -log_file=/opt/cellframe-node/var/log/cellframe-node.log -wallets_path=/opt/cellframe-node/var/lib/wallet -ca_folders=[/opt/cellframe-node/var/lib/ca,/opt/cellframe-node/share/ca] -dap_global_db_path=/opt/cellframe-node/var/lib/global_db +pid_path={PREFIX}/var/run/cellframe-node.pid +log_file={PREFIX}/var/log/cellframe-node.log +wallets_path={PREFIX}/var/lib/wallet +ca_folders=[{PREFIX}/var/lib/ca,{PREFIX}/share/ca] +dap_global_db_path={PREFIX}/var/lib/global_db dap_global_db_driver=sqlite3 # Plugins @@ -119,4 +119,4 @@ dap_global_db_driver=sqlite3 # Load Python-based plugins #py_load=false # Path to Pyhon-based plugins -#py_path=/opt/cellframe-node/var/lib/plugins \ No newline at end of file +#py_path={PREFIX}/var/lib/plugins \ No newline at end of file diff --git a/prod_build b/prod_build index b8461030faee163568c9b8da56efc83655fdb427..6cc3793eb163a8c5994fd93a23a684e7be71b8fb 160000 --- a/prod_build +++ b/prod_build @@ -1 +1 @@ -Subproject commit b8461030faee163568c9b8da56efc83655fdb427 +Subproject commit 6cc3793eb163a8c5994fd93a23a684e7be71b8fb diff --git a/scripts.darwin/create_configs.sh b/scripts.darwin/create_configs.sh index 04d07cc65d8b730886322e559aee0c607d21af76..dc5abc427053552c355cbb8851670ee2fbc41d59 100755 --- a/scripts.darwin/create_configs.sh +++ b/scripts.darwin/create_configs.sh @@ -17,4 +17,5 @@ export DAP_SERVER_PORT=8089 export DAP_CORE_T_ENABLED=true export DAP_CORE_T_ROLE=full +echo "Init configs with prefix " $DAP_PREFIX ../scripts/create_configs_from_tpl.sh diff --git a/scripts/create_configs_from_tpl.sh b/scripts/create_configs_from_tpl.sh index a8b9568a668b0038ec13307fbcca43c865e1a629..76ccb571e8aa3b5923d303f27b1c597466345937 100755 --- a/scripts/create_configs_from_tpl.sh +++ b/scripts/create_configs_from_tpl.sh @@ -40,12 +40,12 @@ else fi cat $DAP_CFG_TPL > $DAP_CFG || true -sed -i .old "s/{DEBUG_MODE}/$DAP_DEBUG_MODE /" $DAP_CFG || true -sed -i .old "s/{AUTO_ONLINE}/$DAP_AUTO_ONLINE/" $DAP_CFG || true -sed -i .old "s/{SERVER_ENABLED}/$DAP_SERVER_ENABLED/" $DAP_CFG || true -sed -i .old "s/{SERVER_PORT}/$DAP_SERVER_PORT/" $DAP_CFG || true -sed -i .old "s/{SERVER_ADDR}/$DAP_SERVER_ADDR/" $DAP_CFG || true -sed -i .old "s/{PREFIX}/$DAP_PREFIX_TPL/" $DAP_CFG || true +sed -i .old "s/{DEBUG_MODE}/$DAP_DEBUG_MODE/g" $DAP_CFG || true +sed -i .old "s/{AUTO_ONLINE}/$DAP_AUTO_ONLINE/g" $DAP_CFG || true +sed -i .old "s/{SERVER_ENABLED}/$DAP_SERVER_ENABLED/g" $DAP_CFG || true +sed -i .old "s/{SERVER_PORT}/$DAP_SERVER_PORT/g" $DAP_CFG || true +sed -i .old "s/{SERVER_ADDR}/$DAP_SERVER_ADDR/g" $DAP_CFG || true +sed -i .old "s/{PREFIX}/$DAP_PREFIX_TPL/g" $DAP_CFG || true rm $DAP_CFG.old # Init chains