From 1b146a4ddeff5a15269fadc91c787e23ee2dd706 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 19 Aug 2024 16:43:54 +0800 Subject: [PATCH 1/2] rename kdf DB path to retain prior history --- src/core/atomicdex/services/kdf/kdf.service.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/core/atomicdex/services/kdf/kdf.service.cpp b/src/core/atomicdex/services/kdf/kdf.service.cpp index 741a21fdea..6c7e654afb 100644 --- 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; From a3db7f3eaaa229ac307f6a27c1b59b076b5c5b25 Mon Sep 17 00:00:00 2001 From: smk762 Date: Mon, 19 Aug 2024 18:30:29 +0800 Subject: [PATCH 2/2] fix nim build error --- .github/workflows/atomicdex-desktop-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/atomicdex-desktop-ci.yml b/.github/workflows/atomicdex-desktop-ci.yml index 45c8fa9ec1..8263413217 100644 --- 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