Merge branch 'dev-kdf' into fix/privacy-mode-history

KomodoPlatform · Aug 19, 2024 · 3eda9f2 · 3eda9f2
2 parents 1b415db + a3db7f3
commit 3eda9f2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml
@@ -160,6 +160,7 @@ jobs:
           echo "CHOOSENIM_CHOOSE_VERSION=1.6.2" >> $GITHUB_ENV
           export CHOOSENIM_CHOOSE_VERSION=1.6.2
           curl https://nim-lang.org/choosenim/init.sh > choosenim.sh
+          sed -i.bak 's|https://github.com/nim-lang/choosenim/releases/download/|https://github.com/dom96/choosenim/releases/download/|g' choosenim.sh
           chmod +x choosenim.sh
           ./choosenim.sh -y
           export PATH=/home/runner/.nimble/bin:$PATH
@@ -171,6 +172,7 @@ jobs:
           echo "CHOOSENIM_CHOOSE_VERSION=1.6.2" >> $GITHUB_ENV
           export CHOOSENIM_CHOOSE_VERSION=1.6.2
           curl https://nim-lang.org/choosenim/init.sh > choosenim.sh
+          sed -i.bak 's|https://github.com/nim-lang/choosenim/releases/download/|https://github.com/dom96/choosenim/releases/download/|g' choosenim.sh
           chmod +x choosenim.sh
           ./choosenim.sh -y
           export PATH=/Users/runner/.nimble/bin:$PATH

diff --git a/src/core/atomicdex/services/kdf/kdf.service.cpp b/src/core/atomicdex/services/kdf/kdf.service.cpp
@@ -2227,6 +2227,17 @@ namespace atomic_dex
             .passphrase = std::move(passphrase), 
             .rpc_password = std::move(rpcpass) == "" ? std::move(atomic_dex::gen_random_password()) : std::move(rpcpass)
         };
+
+        auto dbdir = std::filesystem::path(cfg.dbdir);
+        auto old_dbdir = std::filesystem::path(utils::get_atomic_dex_data_folder() / "mm2" / "DB");
+        if (not std::filesystem::exists(dbdir))
+        {
+            if (std::filesystem::exists(old_dbdir))
+            {
+                std::filesystem::rename(old_dbdir, dbdir);
+            }
+        }
+
         kdf::set_system_manager(m_system_manager);
         kdf::set_rpc_password(cfg.rpc_password);
         json       json_cfg;