Skip to content

Commit

Permalink
Merge pull request #9 from KomodoPlatform/0.8.1-dev
Browse files Browse the repository at this point in the history
misc minor fixes for RC
  • Loading branch information
smk762 authored Nov 11, 2024
2 parents 0e2e158 + bc24099 commit 9022079
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ endif ()
##! We fetch our dependencies
if (APPLE)
FetchContent_Declare(kdf
URL https://sdk.devbuilds.komodo.earth/dev/mm2_b35a818-mac-x86-64.zip)
URL https://sdk.devbuilds.komodo.earth/dev/mm2_dfca6b7-mac-x86-64.zip)
elseif (UNIX AND NOT APPLE)
FetchContent_Declare(kdf
URL https://sdk.devbuilds.komodo.earth/dev/mm2_b35a818-linux-x86-64.zip)
URL https://sdk.devbuilds.komodo.earth/dev/mm2_dfca6b7-linux-x86-64.zip)
else ()
FetchContent_Declare(kdf
URL https://sdk.devbuilds.komodo.earth/dev/mm2_b35a818-win-x86-64.zip)
URL https://sdk.devbuilds.komodo.earth/dev/mm2_dfca6b7-win-x86-64.zip)
endif ()

#FetchContent_Declare(qmaterial URL https://github.com/KomodoPlatform/Qaterial/archive/last-clang-working-2.zip)
Expand Down
4 changes: 3 additions & 1 deletion src/core/atomicdex/api/kdf/rpc_v1/rpc.electrum.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ namespace atomic_dex::kdf
{
j["coin"] = cfg.coin_name;
j["tx_history"] = cfg.with_tx_history;
j["min_connected"] = 1;
j["max_connected"] = 3;

if (!cfg.servers.empty())
{
Expand Down Expand Up @@ -70,4 +72,4 @@ namespace atomic_dex::kdf
j.at("balance").get_to(cfg.balance);
j.at("result").get_to(cfg.result);
}
} // namespace atomic_dex::kdf
} // namespace atomic_dex::kdf
4 changes: 3 additions & 1 deletion src/core/atomicdex/api/kdf/rpc_v1/rpc.electrum.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ namespace atomic_dex::kdf
std::optional<nlohmann::json> merge_params;
std::optional<std::vector<std::string>> bchd_urls;
std::optional<bool> allow_slp_unsafe_conf;
int min_connected{1};
int max_connected{3};
};

struct electrum_answer
Expand All @@ -59,4 +61,4 @@ namespace atomic_dex
{
using t_electrum_request = kdf::electrum_request;
using t_electrum_answer = kdf::electrum_answer;
} // namespace atomic_dex
} // namespace atomic_dex
4 changes: 3 additions & 1 deletion src/core/atomicdex/services/kdf/kdf.service.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -855,7 +855,9 @@ namespace atomic_dex
.servers = coin_config.electrum_urls.value_or(get_electrum_server_from_token(coin_config.ticker)),
.coin_type = coin_config.coin_type,
.is_testnet = coin_config.is_testnet.value_or(false),
.with_tx_history = true
.with_tx_history = true,
.min_connected = 1,
.max_connected = 3
};
if (coin_config.merge_utxos.value_or(false))
{
Expand Down

0 comments on commit 9022079

Please sign in to comment.