Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

misc minor fixes for RC #9

Merged
merged 4 commits into from
Nov 11, 2024
Merged

misc minor fixes for RC #9

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
389312a
add electrum connection limit params to activation
smk762 Oct 29, 2024
195aca5
add missing commas
smk762 Oct 30, 2024
cfc9545
add new params to struct and json transform
smk762 Oct 30, 2024
bc24099
use latest dev kdf
smk762 Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/core/atomicdex/api/kdf/rpc_v1/rpc.electrum.cpp
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading