diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c364c615d47a271f902c90246b0a64210d0fc92f..e5633da0d0ee3a554bef50729b1f88a18f355c40 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,7 @@ variables: GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_UPDATE_FLAGS: --force + workflow: rules: @@ -64,7 +65,7 @@ stages: allow_failure: true .fill_version_mk: &fill_version_mk - - PATCH_NUM_VAR_NAME=$(echo "${CI_COMMIT_REF_SLUG}" | tr "-" _)_PATCH_NUM + - PATCH_NUM_VAR_NAME=P_$(echo "${CI_COMMIT_REF_SLUG}" | tr "-" _)_PATCH_NUM - echo ${PATCH_NUM_VAR_NAME} - 'PATCH_NUM=$(curl -s --header "PRIVATE-TOKEN: ${ACCESS_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/variables/${PATCH_NUM_VAR_NAME}" | jq -r ".value // empty")' - echo "Gitlab var patch number for ${PATCH_NUM_VAR_NAME} is ${PATCH_NUM}." @@ -220,8 +221,7 @@ amd64:macos.release: - echo "Do hard work" - ./prod_build/build.sh --target osx release - ./prod_build/pack.sh --target osx release --sign /opt/buildtools/sign/macos/demlabs.sh - - /opt/buildtools/deploy_files.sh pub_cellframe macos/cellframe-node/$CI_COMMIT_REF_NAME/ build_*/*.pkg - - /opt/buildtools/deploy_files.sh pub_cellframe macos/cellframe-node/$CI_COMMIT_REF_NAME/ build_*/*-signed.pkg --redirect-with-link macos/cellframe-node/$CI_COMMIT_REF_NAME/latest-amd64 --just-redirect + - /opt/buildtools/deploy_files.sh pub_cellframe macos/cellframe-node/$CI_COMMIT_REF_NAME/ build_*/*-signed.pkg --redirect-with-link macos/cellframe-node/$CI_COMMIT_REF_NAME/latest-amd64 artifacts: paths: - build_*/*.pkg @@ -260,9 +260,14 @@ amd64:linux.tps: - ./prod_build/pack.sh --target linux release - /opt/buildtools/deploy_files.sh pub_cellframe linux/cellframe-node/$CI_COMMIT_REF_NAME/ build_*/*.deb -.amd64:linux.updtr: +amd64:linux.updtr: extends: .build + stage: build image: demlabs/debian/amd64:qt5 + rules: + - when: manual + allow_failure: true + before_script: - /opt/buildtools/prepare_environment.sh amd64-linux - *fill_version_mk diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c1d051847fc0a251b4df48605a1499a28f88044..9483a1570896f656d20673747dedaaea92a7c747 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_ENABLE_EXPORTS ON) set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_COLOR_MAKEFILE ON) set(CMAKE_C_STANDARD 11) - + # Predefine project SET( CPACK_PACKAGE_NAME "${PROJECT_NAME}") ReadVariables(version.mk) @@ -313,6 +313,15 @@ if(UNIX AND NOT WIN32) add_definitions("-DPYTHON_VERSION=\"python3.10\"") endif() + if (DARWIN) + if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm") + set(PYTHON_URL "https://pub.cellframe.net/3rdparty/python/cpython-3.10.16+20250212-aarch64-apple-darwin-install_only.tar.gz") + else () + set(PYTHON_URL "https://pub.cellframe.net/3rdparty/python/cpython-3.10.16%2B20250205-x86_64-apple-darwin-install_only.tar.gz") + endif() + add_definitions("-DPYTHON_VERSION=\"python3.10\"") + endif() + message("[+] Build with python environment") message(" Downloading static prebuild cpython ${PYTHON_URL}") #this python was build by compiling and installing static python distrip to /opt/cellframe-node/ and @@ -336,9 +345,9 @@ if(UNIX AND NOT WIN32) list(APPEND CMAKE_PREFIX_PATH ${cpythonstatic_SOURCE_DIR}) if ( CPACK_DEBIAN_PACKAGE_ARCHITECTURE MATCHES "arm") - find_package(Python EXACT 3.11 COMPONENTS Interpreter Development REQUIRED) + find_package(Python EXACT 3.11 COMPONENTS Development REQUIRED) else() - find_package(Python EXACT 3.10 COMPONENTS Interpreter Development REQUIRED) + find_package(Python EXACT 3.10 COMPONENTS Development REQUIRED) endif() target_link_options(${NODE_TARGET} PUBLIC "-Wl,-rpath,${CMAKE_INSTALL_PREFIX}/python/lib/") @@ -368,8 +377,15 @@ if(UNIX AND NOT WIN32) include_directories(${Python_INCLUDE_DIRS} include/) add_subdirectory(python-cellframe) - + #this helps + #install_name_tool -change /install/lib/libpython3.10.dylib @executable_path/../../python/lib/libpython3.10.dylib ./build_osx_rwd/dist/Applications/CellframeNode.app/Contents/MacOS/cellframe-node list(APPEND NODE_LIBRARIES dap_plugins_python ${Python_LIBRARIES}) + if (DARWIN) + add_custom_command(TARGET ${NODE_TARGET} + POST_BUILD COMMAND + ${CMAKE_INSTALL_NAME_TOOL} -change /install/lib/libpython3.10.dylib @executable_path/../Frameworks/python/lib/libpython3.10.dylib + ${NODE_TARGET}) + endif() endif() if(ANDROID ) @@ -403,6 +419,25 @@ if(DARWIN) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/os/macos/com.demlabs.cellframe-diagtool.plist DESTINATION ${SHAREDIR} ) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/os/macos/Info.plist DESTINATION ${CONTENTSDIR} ) + if (BUILD_WITH_PYTHON_ENV) + set(PYTHON_PIP "${cpythonstatic_SOURCE_DIR}/bin/pip3") + set(PYTHON_BIN "${cpythonstatic_SOURCE_DIR}/bin/python3.10") + set(PYTHON_LIB "${cpythonstatic_SOURCE_DIR}/lib/libpython3.10.dylib") + set(PYTHON_LIB_DIR "${cpythonstatic_SOURCE_DIR}/lib/python3.10") + set(PYTHON_LIB_DIR_PRFX "python3.10") + + INSTALL(FILES ${PYTHON_PIP} DESTINATION ${RLIBDIR}/python/bin/ ) + INSTALL(FILES ${PYTHON_BIN} DESTINATION ${RLIBDIR}/python/bin/ ) + INSTALL(FILES ${PYTHON_LIB} DESTINATION ${RLIBDIR}/python/lib/ ) + + INSTALL(DIRECTORY ${PYTHON_LIB_DIR} DESTINATION ${RLIBDIR}/python/lib/ USE_SOURCE_PERMISSIONS) + + #install python-modules + INSTALL(DIRECTORY python-cellframe/dists/python-modules/pycfhelpers DESTINATION ${RLIBDIR}/python/lib/${PYTHON_LIB_DIR_PRFX}/site-packages USE_SOURCE_PERMISSIONS) + INSTALL(DIRECTORY python-cellframe/dists/python-modules/pycftools DESTINATION ${RLIBDIR}/python/lib/${PYTHON_LIB_DIR_PRFX}/site-packages USE_SOURCE_PERMISSIONS) + INSTALL(DIRECTORY python-cellframe/dists/interfaces DESTINATION ${RLIBDIR}/python/lib/ USE_SOURCE_PERMISSIONS) + endif() + else() INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dist/ DESTINATION ${CMAKE_INSTALL_PREFIX} FILES_MATCHING PATTERN "*" PATTERN "*") diff --git a/cellframe-sdk b/cellframe-sdk index 4e60740ab04af8be5550c7e07317d425c3cf453e..1986edc2233e084afdeecb312e95ed137ae0eb63 160000 --- a/cellframe-sdk +++ b/cellframe-sdk @@ -1 +1 @@ -Subproject commit 4e60740ab04af8be5550c7e07317d425c3cf453e +Subproject commit 1986edc2233e084afdeecb312e95ed137ae0eb63 diff --git a/conftool/main.cpp b/conftool/main.cpp index 6e56531bcf28a6231254736f8513e9dc68c4feae..1d5c098c4ab37dfd08423fd6c6f93ad3df24ad99 100644 --- a/conftool/main.cpp +++ b/conftool/main.cpp @@ -114,11 +114,11 @@ std::string getNodeConfigPath(std::string basepath){ #endif #ifdef __linux__ - return "/opt/cellframe-node/"; + return "/opt/cellframe-node"; #endif #ifdef __APPLE__ - return "/Library/Application Support/CellframeNode/"; + return "/Library/Application Support/CellframeNode"; #endif @@ -130,7 +130,7 @@ std::string getNodeConfigPath(std::string basepath){ std::wstring path; GetStringRegKey(hKey, L"Common Documents", path, L""); std::string stdpath(path.begin(),path.end()); - return (std::filesystem::path{stdpath}/"cellframe-node/").string(); + return (std::filesystem::path{stdpath}/"cellframe-node").string(); #endif } diff --git a/dap-sdk b/dap-sdk index a7b6da64ee24a3aba64dcbbd5f3f356069d853ad..dafe5ac222f390aed78fc60528d04d2905555361 160000 --- a/dap-sdk +++ b/dap-sdk @@ -1 +1 @@ -Subproject commit a7b6da64ee24a3aba64dcbbd5f3f356069d853ad +Subproject commit dafe5ac222f390aed78fc60528d04d2905555361 diff --git a/diagtool b/diagtool index dfeb4a8f76a59842321ef40d56eb8509417d19b3..293cc6c4038ea85c6819d9f847ad3802b02162b5 160000 --- a/diagtool +++ b/diagtool @@ -1 +1 @@ -Subproject commit dfeb4a8f76a59842321ef40d56eb8509417d19b3 +Subproject commit 293cc6c4038ea85c6819d9f847ad3802b02162b5 diff --git a/dist.linux/share/update.sh b/dist.linux/share/update.sh index e15f4fe875fceba530b78e1e5c276c77b84967f1..43710d3001bab27292376256df75370803225f1d 100755 --- a/dist.linux/share/update.sh +++ b/dist.linux/share/update.sh @@ -1,6 +1,7 @@ - #! /bin/bash +#! /bin/bash set -e -STORAGE_URL=https://pub.cellframe.net/linux/cellframe-node/master/updates +STORAGE_URL=https://pub.cellframe.net/linux/cellframe-node/master + MACHINE=$(uname -m) @@ -45,13 +46,22 @@ CURRENT_REBUILD=$(echo $INSTALLED_VERSION | grep -Po "[0-9]([0-9]+)") echo "Available patch: $MAX_REBUILD | Current patch: $CURRENT_REBUILD" if (( MAX_REBUILD > CURRENT_REBUILD )); then - echo "Need update cellframe-node to 5.2-$MAX_REBUILD..." + # Determine the full version (e.g. 5.3-354) from AVAILABLE_VERSIONS by the patch we found + for ver in "${AVAILABLE_VERSIONS[@]}" + do + patch=$(echo $ver | cut -d'-' -f2) + if [ "$patch" = "$MAX_REBUILD" ]; then + NEW_VERSION=$ver + break + fi + done + echo "Need update cellframe-node to $NEW_VERSION..." else echo "No need to update cellframe-node" exit 0 fi -PACKAGE_NAME="cellframe-node-5.2-$MAX_REBUILD-updtr-amd64.deb" +PACKAGE_NAME="cellframe-node-$NEW_VERSION-updtr-${POSTFIX}.deb" echo "wget" mkdir -p /tmp/cfupd/ wget $STORAGE_URL/$PACKAGE_NAME -O /tmp/cfupd/$PACKAGE_NAME @@ -73,4 +83,4 @@ fi dpkg -i /tmp/cfupd/$PACKAGE_NAME -service cellframe-node restart \ No newline at end of file +service cellframe-node restart diff --git a/dist/etc/network/Backbone/chain-0.cfg.d/ledger_hal.cfg b/dist/etc/network/Backbone/chain-0.cfg.d/ledger_hal.cfg index 65dad94771d4997bcdf20cfc3cea4a7cd6c4accf..877c9a19ee6bcca0b214f9686540c6fc8f2550fa 100644 --- a/dist/etc/network/Backbone/chain-0.cfg.d/ledger_hal.cfg +++ b/dist/etc/network/Backbone/chain-0.cfg.d/ledger_hal.cfg @@ -610,5 +610,15 @@ hard_accept_list=[0xED2CDC9BBE884E2C6A3D974F2191D204326D177C1B24E811D576E1C12174 0x37C5940801A5D655B4853CCCB26E100862BB2D4E07CE9FEA9DA04E3EDDB514DB, 0xB166BA0A7242E629C7437B4E9EED7488CAA85EF49E7238F599B8A40FB6D62527, 0x17DF1A96A36B95721BB7D47899B3DF0626D6993B9D31B2F4888760A02D8AA499, -0x6F537559DD59A8EA933A4A5DA76F221FB477F90556531B892824F0100E99AA56] +0x6F537559DD59A8EA933A4A5DA76F221FB477F90556531B892824F0100E99AA56, +0x92B1D7EAA7492FB204428CA63674811FA78F68F7E6DE05442D09CFA50B23843A, +0x8B66EA93472F6F8027974A9EC071CB5FD9637357B8D231B250E75D73F955F2B8, +0x9918EA7ACBB7502BC8CB239E313AF3F5FCA322AE2169DDCCE18D0CE76F09F001, +0xA2116DA12B29381B92D107350C9AA2CABA079007869ACA0D44055C21F3FC1530, +0x9344549FA0ACEF099171F7AFDFCE64A21E1BBDAC715B1BEF0AA9F561905B6433, +0x4348C6725D2FFDDDF0AD7661E351AFAEB28D020E6B2B93865A77C05639AE7223, +0xF5C5D99561A3511B902F0B92CF249ED2E69F86BE012B96EDAE1D678D5FCC8181, +0x0D2D19E4AE26AE233B7D7BEC564D96B642513FAB5C28464136334917DD87196B, +0x80B3F7E19A2032229C0AB6E36F9136A49BBAD7DD6EADDF3CC14657425E1403A7 +] diff --git a/dist/etc/network/riemann/main.cfg.d/ledger_hal.cfg b/dist/etc/network/riemann/main.cfg.d/ledger_hal.cfg index 849b6aecfd9869bd9b657c41243066a1e0b336d4..f7243d3590c7d6d436dedc162b441961cab71d4f 100644 --- a/dist/etc/network/riemann/main.cfg.d/ledger_hal.cfg +++ b/dist/etc/network/riemann/main.cfg.d/ledger_hal.cfg @@ -1,2 +1,34 @@ [ledger] -hard_accept_list = [ 0x794D1B0237E34BC06E957B1BAFE324F53EAF34E58943836E7C61A95676C9EEF8 ] +hard_accept_list = [ 0x794D1B0237E34BC06E957B1BAFE324F53EAF34E58943836E7C61A95676C9EEF8, +0xC5B7F025AE8B095FE0A63EA4F7BB561F1E050218EA1D19CFBAFA253922F4D4A5, +0xEBC69982445C285F79335A7FA9AD3A0311EB9A1BB77C18498D04BB317CD743B1, +0xF143D54AAF4741E7ADA26EAA5FBCC9B8CFDA1BC77CB6C247AF919D6E334CB055, +0x70D12C7A09861EB7A6825C47CE36E1CEA779C8F5A68C5AC31ECD7135941515B9, +0x76F1AEA4051E8F3E5B6E43E9CD793A410F0C0AE0AFF1ACE5A5647231FB52C397, +0x4B17E462A0A884DB47153C5F5822C5E832363A1C2B2340B0E30E230962DD5AAC, +0x2A181A1CBF7CEC347ED9251D4342C17A0FBF0055A158ADF2D5D3986888A9CD74, +0x91A46F7FB257FE752C9BCE5E24998F7971CE0F23A710AFB8F45D5284D9184039, +0x5D1548A8A88837834DED81DD2CB3582F608A9DF222189A258F1D48CC74CABADD, +0x2895F08C71AA0A2B90030C640064F027AA7D5901752A923D3F1EA6115A196535, +0x5D3986C201846CA9A31D7B919410293DD0E0B683F611428D552647EE681FC4E2, +0x4DF16A35BCEB1F590B9468B7B904CDAB77BCEE119CA744AB34E9CC870EAB8EDD, +0x61112BFA0F05930429AD3183A28F5134E204B2518038060E4DB91829268F9DE0, +0x716088FD76E9B3BF0E78E36AE44474A4C17B3FB4AD0762BE367D1E8E9217F48B, +0xCD12004FEB8551E3CB9DDCBD1BF1648F0F5389CECADFC77909408C1A8E937FCA, +0x9A9377E0B6990A32681B978307F6FAAA9FB4586A8CDE25EFA203D1E7D0CFAA35, +0xFA765FE27DD83BD0E5800E1468CB8C56E3C07F38BAD3E8111FB581F9C2D2D48F, +0xD55EB0E8B948BD85FF1F46C26EAA9CD24538A425E7A123817A0A9D6BE64B4211, +0x6269C2ACD3D499477C67D97E8976BD80E0CDD930840B7A447EDB8E6F9BB99956, +0x077BC808059E31F38F5C3E3E3D3F7B6FD5B40405488C27B28AD9CF684BE086B2, +0x77075B15C5DC20A2E9CA0AB3C7FAD69608B487BD724531BCE6044ED86DB8C6B1, +0x9FEC4CE00BC3228A511CEF606240EBF8BD06F11B2F94F13ED9F8A1812E3EDA7D, +0xE57866E969A118BFA6F896AF4261EB8DC7FFB28FEBC94C39E7B82A2CDDFE5A62, +0x08CA316B9AB2998F0BF36B86E689BB57DB4E72006CBBE377C7E4AF1284990A8C, +0xDC1B3FB847209F0692537404EF74966235462799EF0623CFE9F93E123A838435, +0x7BE1C24AF225CF02A953B60CCB35F5FA990D46F7F942297C297467FC5195BAEF, +0x365C0B7C36D75E518DFDF30D677B47B2E7DE7D5496AC70D47CFA14D456E9D604, +0xF0C9191B847A07C16F6DB231A1E3272F01FE74A6D7244871F35E244E30ED04C7, +0xC5AB6B89D6277925F603E25EBCCA0F0DA91B03FA49475F4EAA07A59B55CB5D28, +0x4D13C6B9C4F9FDA4CC5509975C243E1E375B52DB0E38DD80E871C6D114987113, +0xEB8862ADA8E9ABDCE4D28A1299889896270F663D863E7108F4974470223AA0BB +] diff --git a/dist/share/configs/cellframe-node.cfg b/dist/share/configs/cellframe-node.cfg index 6de66576974e1d76b1bca9edc22fd30ff280dafc..0a0fe0fd2c73e0047f393250ef9893fd354840aa 100644 --- a/dist/share/configs/cellframe-node.cfg +++ b/dist/share/configs/cellframe-node.cfg @@ -188,7 +188,7 @@ driver= #pgsql conninfo array # pg_conninfo=[dbname=postgres] -# Plugins +# Plugins [plugins] enabled=true # Load Python-based plugins diff --git a/dist/share/configs/network/Backbone.cfg b/dist/share/configs/network/Backbone.cfg index fb67e61e3cb8cfe5b25890d0ecff3ed46d18fc4d..bb8094485c5340d6cd74bd3d08d6527ae5325473 100755 --- a/dist/share/configs/network/Backbone.cfg +++ b/dist/share/configs/network/Backbone.cfg @@ -30,3 +30,6 @@ seed_nodes_hosts=[0.root.scorpion.cellframe.net:8079,1.root.scorpion.cellframe.n #collecting_level=10.0 #fee_addr=myaddr +# [policy] +# activate=1 +# deactivate=[0,1] diff --git a/dist/share/configs/network/KelVPN.cfg b/dist/share/configs/network/KelVPN.cfg index 0df7436192412fe331b12c9a753b5e34ff9a9fb8..6063a0fb708d6370078b5073ef10dae495939131 100644 --- a/dist/share/configs/network/KelVPN.cfg +++ b/dist/share/configs/network/KelVPN.cfg @@ -25,3 +25,7 @@ seed_nodes_hosts=[0.root.kelvpn.com:8079,1.root.kelvpn.com:8079,2.root.kelvpn.co #blocks-sign-cert=mycert #collecting_level=10.0 #fee_addr=myaddr + +# [policy] +# activate=1 +# deactivate=[0,1] diff --git a/dist/share/configs/network/mileena.cfg b/dist/share/configs/network/mileena.cfg index 0de09143a4011e077cd7c3da8c02b2d59a834b64..8dc101fbcb3711233ab696f80b50e0845f4531ea 100755 --- a/dist/share/configs/network/mileena.cfg +++ b/dist/share/configs/network/mileena.cfg @@ -33,3 +33,7 @@ seed_nodes_addrs=[CCCC::0000::0000::0000,CCCC::0000::0000::0001,CCCC::0000::0000 #[block-poa] #blocks-sign-cert=mycert + +# [policy] +# activate=1 +# deactivate=[0,1] diff --git a/dist/share/configs/network/raiden.cfg b/dist/share/configs/network/raiden.cfg index 07bc8d3b0bd827d6d5b08312861c00247b2174ed..0aa8df938ea193159a040a51578cf35281e1f256 100644 --- a/dist/share/configs/network/raiden.cfg +++ b/dist/share/configs/network/raiden.cfg @@ -34,3 +34,7 @@ seed_nodes_hosts=[0.root.raiden.cellframe.net:8079, 1.root.raiden.cellframe.net: #blocks-sign-cert=mycert #collecting_level=10.0 #fee_addr=myaddr + +# [policy] +# activate=1 +# deactivate=[0,1] diff --git a/dist/share/configs/network/riemann.cfg b/dist/share/configs/network/riemann.cfg index 0264e674c13ef6d71be2ba1aa45222c06050c296..8c437d313b125ad658bb835816a3f7be0749bbf9 100644 --- a/dist/share/configs/network/riemann.cfg +++ b/dist/share/configs/network/riemann.cfg @@ -32,3 +32,7 @@ seed_nodes_hosts=[0.root.riemann.cellframe.net:8079, 1.root.riemann.cellframe.ne #blocks-sign-cert=mycert #collecting_level=10.0 #fee_addr=myaddr + +# [policy] +# activate=1 +# deactivate=[0,1] diff --git a/dist/share/configs/network/subzero.cfg b/dist/share/configs/network/subzero.cfg index 298158d715dea5952f133a616a0f343a649a1393..c8fe9e2c997199211d01cc8272d836a323e3e9e0 100755 --- a/dist/share/configs/network/subzero.cfg +++ b/dist/share/configs/network/subzero.cfg @@ -32,3 +32,7 @@ seed_nodes_hosts=[0.root.subzero.cellframe.net:8190, 1.root.subzero.cellframe.ne #blocks-sign-cert=mycert #collecting_level=10.0 #fee_addr=myaddr + +# [policy] +# activate=1 +# deactivate=[0,1] diff --git a/dist/share/default.setup b/dist/share/default.setup index dd929b4c15068327fe443b27c32410418be96e6b..c0de7be100ad4969c2560b8f97ed3fe126e461b2 100644 --- a/dist/share/default.setup +++ b/dist/share/default.setup @@ -7,7 +7,7 @@ # Predefined variables: # ${HOST_OS} -> Linux | Windows | Macos # ${HOSTNAME} -> hostname of a machine -# ${CONFIGS_PATH} -> /opt/cellframe-node/ for linux, +# ${CONFIGS_PATH} -> /opt/cellframe-node for linux, # Common Documents (usually C:\Users\Public\Documents\cellframe-node\) for Windows # # fromtemplate: create and populate config from "share/configs" templates @@ -90,7 +90,7 @@ if Linux != ${HOST_OS} config cellframe-node plugins enabled ensure false endif -config cellframe-node plugins py_path ensure ${CONFIGS_PATH}/var/lib/plugins +config cellframe-node plugins py_path ensure ../var/lib/plugins config Backbone general node-role default full config KelVPN general node-role default full diff --git a/python-cellframe b/python-cellframe index 54f405e91a7464f51dd40c3fe2209db37714e5d5..7c3af121722e24687a6e5e4d963d782d17245eca 160000 --- a/python-cellframe +++ b/python-cellframe @@ -1 +1 @@ -Subproject commit 54f405e91a7464f51dd40c3fe2209db37714e5d5 +Subproject commit 7c3af121722e24687a6e5e4d963d782d17245eca diff --git a/sources/cellframe-node.c b/sources/cellframe-node.c index 921960e89173ff983c875ac30b6ded88495bae00..4255a192bdd3568febcef43daf06f7fab41efbc3 100755 --- a/sources/cellframe-node.c +++ b/sources/cellframe-node.c @@ -114,6 +114,7 @@ #include "dap_chain_net_srv_emit_delegate.h" #include "dap_chain_wallet_cache.h" +#include "dap_chain_policy.h" #include "dap_events_socket.h" #include "dap_client.h" @@ -365,6 +366,11 @@ int main( int argc, const char **argv ) return -65; } + if( dap_chain_policy_init() ){ + log_it(L_CRITICAL,"Can't init dap chain policy module"); + return -66; + } + if( dap_chain_wallet_init() ) { log_it(L_CRITICAL,"Can't init dap chain wallet module"); return -61;