diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21405adcd0b5f6ebeb1cc1ccc190de9820597bd6..867c4aaec93fad6f771c3ef88ecc4196902364e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -108,6 +108,7 @@ if(UNIX)
set(BUNDLE_NAME "CellframeNode.app")
set(BUNDLE_PATH "${CMAKE_INSTALL_PREFIX}")
set(BINDIR ${BUNDLE_PATH}/Contents/MacOS)
+ set(CONTENTSDIR ${BUNDLE_PATH}/Contents/)
set(LIBDIR ${BUNDLE_PATH})
set(RLIBDIR ${BUNDLE_PATH}/Contents/Frameworks)
set(SHAREDIR ${BUNDLE_PATH}/Contents/Resources)
@@ -376,6 +377,8 @@ if(DARWIN)
INSTALL(TARGETS cellframe-node-config DESTINATION ${BINDIR} )
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/os/macos/com.demlabs.cellframe-node.plist DESTINATION ${SHAREDIR} )
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/os/macos/Info.plist DESTINATION ${CONTENTSDIR} )
+
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 d85ccdcbd020f87754713a9028af535488256b5e..b9e94b103c8d065472635cdb4adb9ac3507b9a86 160000
--- a/cellframe-sdk
+++ b/cellframe-sdk
@@ -1 +1 @@
-Subproject commit d85ccdcbd020f87754713a9028af535488256b5e
+Subproject commit b9e94b103c8d065472635cdb4adb9ac3507b9a86
diff --git a/conftool/main.cpp b/conftool/main.cpp
index 159f556fb3040ee169166754604fb798aa6ee9ba..6e56531bcf28a6231254736f8513e9dc68c4feae 100644
--- a/conftool/main.cpp
+++ b/conftool/main.cpp
@@ -118,7 +118,7 @@ std::string getNodeConfigPath(std::string basepath){
#endif
#ifdef __APPLE__
- return "/Applications/CellframeNode.app/Contents/Resources/";
+ return "/Library/Application Support/CellframeNode/";
#endif
diff --git a/diagtool b/diagtool
index 8e493e24ea7a9c3d7df34bfb2304f7dabbcfb86c..5a405f405168fc33b54a73a605132fe67455dd66 160000
--- a/diagtool
+++ b/diagtool
@@ -1 +1 @@
-Subproject commit 8e493e24ea7a9c3d7df34bfb2304f7dabbcfb86c
+Subproject commit 5a405f405168fc33b54a73a605132fe67455dd66
diff --git a/os/macos/PKGINSTALL/CellframeNode.plist b/os/macos/PKGINSTALL/CellframeNode.plist
index a7fe48140484d3647556e9ef3e2118741d51b357..2536f9c56823dd86e15eaf8cdcb00f73b10673ab 100644
--- a/os/macos/PKGINSTALL/CellframeNode.plist
+++ b/os/macos/PKGINSTALL/CellframeNode.plist
@@ -6,7 +6,7 @@
<key>BundleHasStrictIdentifier</key>
<true/>
<key>BundleIsRelocatable</key>
- <false/>
+ <true/>
<key>BundleIsVersionChecked</key>
<true/>
<key>BundleOverwriteAction</key>
diff --git a/os/macos/PKGINSTALL/PackageInfo b/os/macos/PKGINSTALL/PackageInfo
index c1b21e65fef47085323d967d4f5c9c1cd193ca82..104f6c1e6f59f963b0c7fa3eb294d4955acb3a43 100644
--- a/os/macos/PKGINSTALL/PackageInfo
+++ b/os/macos/PKGINSTALL/PackageInfo
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
-<pkg-info overwrite-permissions="true" relocatable="false" identifier="com.demlabs.CellframeNode" postinstall-action="none" version="0" format-version="2" generator-version="InstallCmds-763 (20G80)" install-location="/Applications/" auth="root">
+<pkg-info overwrite-permissions="true" relocatable="false" identifier="com.demlabs.CellframeNode" postinstall-action="none" format-version="2" generator-version="InstallCmds-860 (24B83)" install-location="/Applications/" auth="root" version="0" >
<payload numberOfFiles="" installKBytes=""/>
- <domains enable_localSystem="false" enable_anywhere="true" enable_currentUserHome="true"/>
+
<bundle id="com.demlabs.CellframeNode" path="./CellframeNode.app"/>
<bundle-version>
<bundle id="com.demlabs.CellframeNode"/>
@@ -14,9 +14,11 @@
<strict-identifier>
<bundle id="com.demlabs.CellframeNode"/>
</strict-identifier>
- <relocate/>
+ <relocate>
+ <bundle id="com.demlabs.CellframeNode"/>
+ </relocate>
<scripts>
- <preinstall file="./preinstall"/>
- <postinstall file="./postinstall"/>
+ <preinstall file="./preinstall" timeout="600"/>
+ <postinstall file="./postinstall" timeout="600"/>
</scripts>
-</pkg-info>
+</pkg-info>
\ No newline at end of file
diff --git a/os/macos/PKGINSTALL/postinstall b/os/macos/PKGINSTALL/postinstall
index df2a498e96047281b5cad7f58f1942ea4e267275..bbf6dce827395f6f72243ba688bec5d764a69ebe 100755
--- a/os/macos/PKGINSTALL/postinstall
+++ b/os/macos/PKGINSTALL/postinstall
@@ -1,24 +1,23 @@
#!/bin/sh
#set -x
-APP_NAME=CellframeNode
-DAP_PREFIX=/Applications/CellframeNode.app/Contents/Resources
-NODE=com.demlabs.cellframe-node
+INSTALL_BINS="/Applications/CellframeNode.app/Contents/MacOS/"
+INSTALL_RES=/Applications/CellframeNode.app/Contents/Resources
+USER_RES="/Library/Application Support/CellframeNode"
-mkdir -p $DAP_PREFIX
-mkdir -p $DAP_PREFIX/etc
-mkdir -p $DAP_PREFIX/share
-mkdir -p $DAP_PREFIX/var/run/
-mkdir -p $DAP_PREFIX/var/lib/
+mkdir -p "${USER_RES}/"
+cp -r "${INSTALL_RES}/etc" "${USER_RES}/"
+cp -r "${INSTALL_RES}/share" "${USER_RES}/"
-/Applications/CellframeNode.app/Contents/MacOS/cellframe-node-config -i /Applications/CellframeNode.app/Contents/Resources/share/default.setup
+mkdir "${USER_RES}/var/run/"
+
+${INSTALL_BINS}/cellframe-node-config -i "${USER_RES}/share/default.setup"
echo "[!] Set cfg permissions"
-#set rwo permissions to configs
-chmod 666 $(find ${DAP_PREFIX}/ -type f)
-#set rwx permissions to dirs
-chmod 777 $(find ${DAP_PREFIX}/ -type d)
+find "${USER_RES}/" -type d -exec chmod 777 {} \;
+find "${USER_RES}/" -type f -exec chmod 666 {} \;
echo "[!] Copy daemon plist"
-cp /Applications/CellframeNode.app/Contents/Resources/com.demlabs.cellframe-node.plist /Library/LaunchDaemons/
-/Applications/CellframeNode.app/Contents/MacOS/cellframe-node-config -e service enable
+cp ${INSTALL_RES}/com.demlabs.cellframe-node.plist /Library/LaunchDaemons/
+
+${INSTALL_BINS}/cellframe-node-config -e service enable
diff --git a/os/macos/PKGINSTALL/preinstall b/os/macos/PKGINSTALL/preinstall
index 3ae5e0672ab4de20a541c0669fda838bdfd08cb5..bf3cb95893b1ae0955c90a7eb071b860177b5c68 100755
--- a/os/macos/PKGINSTALL/preinstall
+++ b/os/macos/PKGINSTALL/preinstall
@@ -1,2 +1,54 @@
#!/bin/sh
-echo "preinstall!"
\ No newline at end of file
+echo "preinstall!"
+
+USER_RES="/Library/Application Support/CellframeNode"
+INSTALL_RES=/Applications/CellframeNode.app/Contents/Resources
+
+/Applications/CellframeNode.app/Contents/MacOS/cellframe-node-config -e service disable || true
+killall cellframe-node cellframe-diagtool
+
+mv_safe() {
+ local SOURCE_DIR="$1"
+ local TARGET_DIR="$2"
+
+ # Ensure the target directory exists
+ mkdir -p "$TARGET_DIR"
+
+ # Loop through each file in the source directory
+ for file in "$SOURCE_DIR"/*; do
+ # Get the base name of the file
+ base_name=$(basename "$file")
+
+ # Set the new file path in the target directory
+ target_file="$TARGET_DIR/$base_name"
+
+ # If the file already exists, rename the file
+ if [[ -e "$target_file" ]]; then
+ # Get the file extension (if any)
+ ext="${base_name##*.}"
+ name="${base_name%.*}"
+
+ # Append a number to the file name to make it unique
+ counter=1
+ while [[ -e "$TARGET_DIR/${name}_$counter.${ext}" ]]; do
+ ((counter++))
+ done
+
+ target_file="$TARGET_DIR/${name}_$counter.${ext}"
+ fi
+
+ # Move the file to the target directory
+ mv "$file" "$target_file"
+ done
+
+ echo "Files moved successfully from $SOURCE_DIR to $TARGET_DIR."
+}
+
+mkdir "${USER_RES}/"
+mkdir -p "${USER_RES}/var/lib/ca/"
+mkdir -p "${USER_RES}/var/lib/wallet/"
+
+mv_safe ${INSTALL_RES}/var/lib/wallet/ "${USER_RES}/var/lib/wallet/"
+mv_safe ${INSTALL_RES}/var/lib/ca/ "${USER_RES}/var/lib/ca/"
+mv_safe $HOME/Applications/Cellframe.app/Contents/Resources/var/lib/wallet/ "${USER_RES}/var/lib/wallet/"
+mv_safe $HOME/Applications/Cellframe.app/Contents/Resources/var/lib/ca/ "${USER_RES}/var/lib/ca/"
\ No newline at end of file
diff --git a/prod_build b/prod_build
index 49d2dc59ee897671e60d3ba26276647cd5cbfdc0..e729633a7a70639d7f12ce0caaa7b1cccbfc26b9 160000
--- a/prod_build
+++ b/prod_build
@@ -1 +1 @@
-Subproject commit 49d2dc59ee897671e60d3ba26276647cd5cbfdc0
+Subproject commit e729633a7a70639d7f12ce0caaa7b1cccbfc26b9
diff --git a/sources/cellframe-node.c b/sources/cellframe-node.c
index d68fd1afbe1619b4983423f395bab64fae8920c2..f55749db32b49cdbb99025179a0d79568cfb400f 100755
--- a/sources/cellframe-node.c
+++ b/sources/cellframe-node.c
@@ -182,7 +182,7 @@ int main( int argc, const char **argv )
#ifdef DAP_OS_WINDOWS
g_sys_dir_path = dap_strdup_printf("%s/%s", regGetUsrPath(), dap_get_appname());
#elif DAP_OS_MAC
- g_sys_dir_path = dap_strdup_printf("/Applications/CellframeNode.app/Contents/Resources");
+ g_sys_dir_path = dap_strdup_printf("/Library/Application Support/CellframeNode/");
#elif DAP_OS_UNIX
g_sys_dir_path = dap_strdup_printf("/opt/%s", dap_get_appname());
#endif
@@ -421,13 +421,14 @@ int main( int argc, const char **argv )
return -11;
}
- dap_chain_net_load_all();
-
+
if( dap_chain_wallet_cache_init() ) {
log_it(L_CRITICAL,"Can't init dap chain wallet module");
return -61;
}
+ dap_chain_net_load_all();
+
log_it(L_INFO, "Automatic mempool processing %s",
dap_chain_node_mempool_autoproc_init() ? "enabled" : "disabled");
diff --git a/sources/main_node_cli.c b/sources/main_node_cli.c
index d56a987f55da4db9666037a29f99432cbda97c3b..90f8231c7d6f3d4dd2f1bf363b4bf887d422f593 100644
--- a/sources/main_node_cli.c
+++ b/sources/main_node_cli.c
@@ -64,7 +64,7 @@ int main(int argc, const char *argv[])
#ifdef DAP_OS_WINDOWS
dap_strdup_printf("%s/%s", regGetUsrPath(), NODE_NAME);
#elif defined DAP_OS_MAC
- dap_strdup_printf("/Applications/CellframeNode.app/Contents/Resources");
+ dap_strdup_printf("/Library/Application Support/CellframeNode/");
#elif defined DAP_OS_UNIX
dap_strdup_printf("/opt/%s", NODE_NAME);
#endif
diff --git a/sources/main_node_tool.c b/sources/main_node_tool.c
index a9d4fd2935609e3537aef9ded6611d18ca8f3e85..e9e00a13d51c0e5a1db505b9d14a25a81d98ba25 100644
--- a/sources/main_node_tool.c
+++ b/sources/main_node_tool.c
@@ -132,7 +132,7 @@ int main(int argc, const char **argv)
#ifdef DAP_OS_WINDOWS
dap_strdup_printf("%s/%s", regGetUsrPath(), dap_get_appname());
#elif defined DAP_OS_MAC
- dap_strdup_printf("/Applications/CellframeNode.app/Contents/Resources");
+ dap_strdup_printf("/Library/Application Support/CellframeNode/");
#elif defined DAP_OS_UNIX
dap_strdup_printf("/opt/%s", dap_get_appname());
#endif
@@ -305,6 +305,12 @@ static int s_wallet_create_wp(int argc, const char **argv) {
}
DAP_DELETE(l_file_name);
+ // Checking that if a password is set, it contains only Latin characters, numbers and special characters, except for spaces.
+ if (!dap_check_valid_password(l_pass_str, dap_strlen(l_pass_str))) {
+ log_it(L_ERROR, "Invalid characters used for password.\n");
+ exit(-2008);
+ }
+
if (l_sig_type.type == SIG_TYPE_MULTI_CHAINED){
if (argc < 8) {
log_it(L_ERROR, "For a signature with type sig_multi_chained, two more signature type parameters must be set.\n");