Skip to content
Snippets Groups Projects
Commit a7f044c5 authored by Dmitriy A. Gerasimov's avatar Dmitriy A. Gerasimov
Browse files

[*] Mass update

parent d8d06325
No related branches found
No related tags found
No related merge requests found
...@@ -9,6 +9,8 @@ set(CMAKE_COLOR_MAKEFILE ON) ...@@ -9,6 +9,8 @@ set(CMAKE_COLOR_MAKEFILE ON)
set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD 11)
set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4) set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 3.4)
find_package (PythonLibs REQUIRED) find_package (PythonLibs REQUIRED)
include_directories(${PYTHON_INCLUDE_DIR} include/) include_directories(${PYTHON_INCLUDE_DIR} include/)
...@@ -64,7 +66,7 @@ else() ...@@ -64,7 +66,7 @@ else()
SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}")
SET( CPACK_PACKAGE_VERSION_MAJOR 0) SET( CPACK_PACKAGE_VERSION_MAJOR 0)
SET( CPACK_PACKAGE_VERSION_MINOR 9) SET( CPACK_PACKAGE_VERSION_MINOR 9)
SET( CPACK_PACKAGE_VERSION_PATCH 12) SET( CPACK_PACKAGE_VERSION_PATCH 13)
add_definitions("-DDAP_VERSION_MAJOR=\"${CPACK_PACKAGE_VERSION_MAJOR}\"") add_definitions("-DDAP_VERSION_MAJOR=\"${CPACK_PACKAGE_VERSION_MAJOR}\"")
add_definitions("-DDAP_VERSION_MINOR=\"${CPACK_PACKAGE_VERSION_MINOR}\"") add_definitions("-DDAP_VERSION_MINOR=\"${CPACK_PACKAGE_VERSION_MINOR}\"")
......
Subproject commit 2974476ec7171d6fd5516bf725d107ac1b9a3bf9 Subproject commit ba212dbc0a9d0a8e730d1ad32fec1f995f8d9f91
Subproject commit 427637bf0bd2cf2421e11aec4c87389148f81e35 Subproject commit 97158dabda11b65023dfb13bb5ee229c05855cec
libdap-chain-python @ c8bd568f
Subproject commit b013c766c9b283754c89fe049d45005567be88fa Subproject commit c8bd568fe810165cf12fa55e96503ef955e09120
libdap-python @ 4702d359
Subproject commit e6d2c3c3d2dc9daac606c56719d43e6c0a8e58ab Subproject commit 4702d3590df6894778c48dc3195399cea432d08a
...@@ -33,7 +33,7 @@ json_string = """{ ...@@ -33,7 +33,7 @@ json_string = """{
"server": { "server": {
"enabled": true, "enabled": true,
"listen_address": "0.0.0.0", "listen_address": "0.0.0.0",
"listen_port_tcp": 8079 "listen_port_tcp": 8099
}, },
"conserver": { "conserver": {
"enabled": true, "enabled": true,
......
...@@ -9,11 +9,11 @@ import MyAuthConf ...@@ -9,11 +9,11 @@ import MyAuthConf
appName = "MyAuth" appName = "MyAuth"
# Generate config # Generate config
jsonCfg=MyAuthConf.getJsonString(appName,"CRITICAL") jsonCfg = MyAuthConf.getJsonString(appName, "CRITICAL")
# Init SDK # Init SDK
try: try:
init( jsonCfg ) init(jsonCfg)
except json.decoder.JSONDecodeError as jex: except json.decoder.JSONDecodeError as jex:
sys.stderr.write("load_json_config JSONdecode :%s" % jex) sys.stderr.write("load_json_config JSONdecode :%s" % jex)
exit(-1) exit(-1)
...@@ -27,7 +27,7 @@ action_arg = {} ...@@ -27,7 +27,7 @@ action_arg = {}
# Parse input arguments # Parse input arguments
for arg in sys.argv: for arg in sys.argv:
counter+=1 counter += 1
# Extract command name # Extract command name
if counter == 1: if counter == 1:
cmdName = arg cmdName = arg
...@@ -45,7 +45,8 @@ def help(): ...@@ -45,7 +45,8 @@ def help():
print("To get this help") print("To get this help")
print("\t"+cmdName+" [help]") print("\t"+cmdName+" [help]")
print("") print("")
print("Generate <Root nodes number> certificates (5 by default) for selected <Algorythm> (\"sig_dil\" by default)") print("Generate <Root nodes number> certificates (5 by default)" +
"for selected <Algorythm> (\"sig_dil\" by default)")
print("\t"+cmdName+" init_root_ca [<Root nodes number>] [<Algorythm>]") print("\t"+cmdName+" init_root_ca [<Root nodes number>] [<Algorythm>]")
print("") print("")
if action == "help": if action == "help":
......
...@@ -33,7 +33,7 @@ def getJsonString(app_name, log_level="DEBUG"): ...@@ -33,7 +33,7 @@ def getJsonString(app_name, log_level="DEBUG"):
"server": { "server": {
"enabled": true, "enabled": true,
"listen_address": "0.0.0.0", "listen_address": "0.0.0.0",
"listen_port_tcp": 8079 "listen_port_tcp": 8099
}, },
"conserver": { "conserver": {
"enabled": true, "enabled": true,
......
...@@ -69,7 +69,7 @@ class CMakeBuild(build_ext): ...@@ -69,7 +69,7 @@ class CMakeBuild(build_ext):
setup( setup(
name="CellFrame", name="CellFrame",
version="0.9-post12", version="0.9-post13",
description="CellFrame SDK", description="CellFrame SDK",
author='Demlabs (2007-2020)', author='Demlabs (2007-2020)',
license="GNU GPLv3", license="GNU GPLv3",
......
...@@ -67,7 +67,7 @@ def getJsonString(var_dir, dist_dir, node_role="full", poa_sign_cert=None,pos_si ...@@ -67,7 +67,7 @@ def getJsonString(var_dir, dist_dir, node_role="full", poa_sign_cert=None,pos_si
"dag-pos":{ "dag-pos":{
"tokens_hold": ["KELT","KEL"], "tokens_hold": ["KELT","KEL"],
"tokens_hold_value": [1000000000,1000000000], "tokens_hold_value": [1000000000,1000000000],
"confirmations_minumum": 3, "confirmations_minumum": 1,
} }
"files":{ "files":{
"storage_dir":"{$var_dir}/lib/network/kelvin-testnet/pasma" "storage_dir":"{$var_dir}/lib/network/kelvin-testnet/pasma"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment