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.

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

Release candidate #4

Merged
merged 76 commits into from
Dec 24, 2024
Merged
Changes from 1 commit
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
4356ebf
add `optional` header
smk762 Sep 21, 2024
e3c8ba8
Add IBC channel input for tendermint sends
smk762 Sep 21, 2024
aa704fc
DefaultTextField -> DexTextField
smk762 Sep 21, 2024
10dfa8d
rm duplicate struct
smk762 Sep 23, 2024
84208f2
fix tendermint activation
smk762 Sep 23, 2024
b9ab863
accomodate tendermint tx history
smk762 Sep 23, 2024
cd5e85d
use feature branch of coins repo
smk762 Sep 23, 2024
64d1c68
set default timespoan for chart
smk762 Sep 26, 2024
e4b9002
dont fetch infos while activation in progress
smk762 Sep 27, 2024
5a8a085
use dev branch api
smk762 Oct 24, 2024
6f772cb
increment version
smk762 Oct 24, 2024
4af1341
fix some build warnings
smk762 Oct 24, 2024
7940fba
fix windows CI build error
smk762 Oct 24, 2024
d044154
fix macos build errors
smk762 Oct 24, 2024
a3f5aa2
handle llvm dep symlink fail
smk762 Oct 24, 2024
1f8e41d
brew fermenting
smk762 Oct 25, 2024
99c7775
update ci upload action
smk762 Oct 25, 2024
0e2e158
Merge pull request #1 from KomodoPlatform/0.8.1-dev
smk762 Oct 28, 2024
70ed54c
Merge branch 'dev' into add/ibc-channel-input
smk762 Oct 28, 2024
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
9022079
Merge pull request #9 from KomodoPlatform/0.8.1-dev
smk762 Nov 11, 2024
2e02d6f
Merge branch 'dev' into add/ibc-channel-input
smk762 Nov 11, 2024
48b385f
fix v2.2.0+ tendermint activation format
smk762 Nov 12, 2024
aa64c2f
Merge pull request #5 from KomodoPlatform/add/ibc-channel-input
smk762 Nov 13, 2024
11899c5
update kdf commit
smk762 Nov 19, 2024
7254e98
use UtxoPerKbyte for custom utxo fees
smk762 Nov 20, 2024
ce0b8b0
Merge pull request #12 from KomodoPlatform/feat/utxo-custom-fee
smk762 Nov 25, 2024
d45100e
use v2.20 release kdf
smk762 Nov 25, 2024
d2928bb
Merge branch 'dev' of https://github.com/KomodoPlatform/komodo-wallet…
smk762 Nov 25, 2024
b94b3b1
component duplication refactor; send form reflow
smk762 Nov 27, 2024
cdb24a4
reduce switch chunkiness
smk762 Nov 27, 2024
6312c5d
tidy up send form layout
smk762 Nov 27, 2024
69e4c06
exclude ibc_channel if param is ""
smk762 Nov 27, 2024
c4abf38
fix error text contrast
smk762 Dec 6, 2024
f64b0eb
Merge pull request #15 from KomodoPlatform/tendermint/memo-warning
smk762 Dec 9, 2024
25b2848
use macos-13 runner
smk762 Dec 9, 2024
9e152ab
Merge pull request #17 from KomodoPlatform/ci/mac-runner
smk762 Dec 9, 2024
a14b6bf
fix mac ci path error
smk762 Dec 10, 2024
762d3c7
update macos sdk path and deploy target
smk762 Dec 11, 2024
a8e53c3
update deployment target
smk762 Dec 11, 2024
b9c0f7d
Merge pull request #18 from KomodoPlatform/ci/mac-runner
smk762 Dec 11, 2024
4c98806
fix toast imports
smk762 Dec 11, 2024
f89bdb6
add number format function
smk762 Dec 11, 2024
5440494
widen simple bestorders panel
smk762 Dec 11, 2024
135e7d4
fix missing theme selectors
smk762 Dec 11, 2024
0b199ed
rename var to avoid global reserved
smk762 Dec 11, 2024
e29f4ef
apply new default colors for theme
smk762 Dec 11, 2024
770c168
fix ref
smk762 Dec 11, 2024
495aeb7
rm unused import
smk762 Dec 18, 2024
f790b93
add docker build container
smk762 Dec 19, 2024
29e6786
build output to logfile
smk762 Dec 19, 2024
dce1ee7
move nimble to build script
smk762 Dec 19, 2024
c6786ed
add libfuse2 dep to script
smk762 Dec 19, 2024
07618f9
appimage without fuze
smk762 Dec 19, 2024
d109cbb
headless nimble
smk762 Dec 19, 2024
59e84cf
add more deps
smk762 Dec 19, 2024
df7f91b
update dockerfile
smk762 Dec 19, 2024
6122a19
add build doc
smk762 Dec 19, 2024
ab008e6
retry dmg mount
smk762 Dec 19, 2024
24aa744
Merge pull request #21 from KomodoPlatform/update/docs
smk762 Dec 19, 2024
c0f5cfe
Merge branch 'dev' into fix/bestorders-overflow
smk762 Dec 19, 2024
de252b2
Merge branch 'dev' into fix/toast
smk762 Dec 19, 2024
f9dc2c9
update linuxdeployqt
smk762 Dec 20, 2024
2052e35
fix theme load error
smk762 Dec 20, 2024
e5c3c1d
fix theming
smk762 Dec 20, 2024
d909354
Merge branch 'fix/toast' into fix/bestorders-overflow
smk762 Dec 20, 2024
2347e9a
fix numeric column formatting
smk762 Dec 20, 2024
915df91
Merge pull request #19 from KomodoPlatform/fix/toast
smk762 Dec 20, 2024
d6fbc0b
handle tier -1 values
smk762 Dec 21, 2024
b38edb2
Merge pull request #20 from KomodoPlatform/fix/bestorders-overflow
smk762 Dec 22, 2024
6a632d8
update kdf core
smk762 Dec 23, 2024
9ab07d1
Merge branch 'dev' of https://github.com/KomodoPlatform/komodo-wallet…
smk762 Dec 23, 2024
6e37bca
update key
smk762 Dec 23, 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
Prev Previous commit
Next Next commit
fix tendermint activation
smk762 committed Sep 23, 2024
commit 84208f2edfeef6bbb107e831fd0e2b4b0e41b0ad
Original file line number Diff line number Diff line change
@@ -20,6 +20,6 @@ namespace atomic_dex::kdf
void from_json(const nlohmann::json& j, enable_tendermint_token_rpc_result& in)
{
j.at("platform_coin").get_to(in.platform_coin);
j.at("balances").get_to<std::unordered_map<std::string, balance_info>>(in.balances);
j.at("balances").get_to<std::unordered_map<std::string, balance_infos>>(in.balances);
}
}
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@
#include <nlohmann/json_fwd.hpp> //> nlohmann::json

#include "atomicdex/api/kdf/rpc.hpp"
#include "atomicdex/api/kdf/balance_info.hpp"
#include "atomicdex/api/kdf/balance_infos.hpp"

namespace atomic_dex::kdf
{
@@ -40,15 +40,15 @@ namespace atomic_dex::kdf
struct expected_result_type
{
std::string platform_coin;
std::unordered_map<std::string, balance_info> balances;
std::unordered_map<std::string, balance_infos> balances;
};

using expected_error_type = rpc_basic_error_type;

expected_request_type request;
std::optional<expected_result_type> result;
std::optional<expected_error_type> error;
std::string raw_result;
std::string raw_result;
};

using enable_tendermint_token_rpc_request = enable_tendermint_token_rpc::expected_request_type;
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@ namespace atomic_dex::kdf

void from_json(const nlohmann::json& json, enable_tendermint_with_assets_result_rpc& out)
{
out.ticker = json["ticker"];
out.address = json["address"];
out.current_block = json["current_block"];
out.tendermint_balances_infos = json["balance"].get<typeof(out.tendermint_balances_infos)>();
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
#include <vector>

#include "atomicdex/api/kdf/rpc.hpp"
#include "atomicdex/api/kdf/balance_info.hpp"
#include "atomicdex/api/kdf/balance_infos.hpp"
#include "atomicdex/config/electrum.cfg.hpp"

namespace atomic_dex::kdf
@@ -33,13 +33,14 @@ namespace atomic_dex::kdf
{
struct tendermint_balance_infos_t
{
balance_info balances;
balance_infos balances;
};

std::string ticker;
std::string address;
std::size_t current_block;
tendermint_balance_infos_t tendermint_balances_infos;
std::unordered_map<std::string, balance_info> tendermint_token_balances_infos;
std::unordered_map<std::string, balance_infos> tendermint_token_balances_infos;
};

using expected_error_type = rpc_basic_error_type;
4 changes: 2 additions & 2 deletions src/core/atomicdex/pages/qt.wallet.page.cpp
Original file line number Diff line number Diff line change
@@ -693,8 +693,8 @@ namespace atomic_dex
.to = address.toStdString(),
.amount = max ? "0" : amount.toStdString(),
.memo = memo.toStdString(),
.max = max,
.ibc_source_channel = ibc_source_channel.toStdString()
.ibc_source_channel = ibc_source_channel.toStdString(),
.max = max
};

auto json_fees = nlohmann::json::parse(QString(QJsonDocument(QVariant(fees_data).toJsonObject()).toJson()).toStdString());
20 changes: 12 additions & 8 deletions src/core/atomicdex/services/kdf/kdf.service.cpp
Original file line number Diff line number Diff line change
@@ -1031,16 +1031,16 @@ namespace atomic_dex
{
for (const auto& tendermint_coin_info : rpc.request.tokens_params)
{
SPDLOG_ERROR("{} {}: ", tendermint_coin_info.ticker, rpc.error->error_type);
fetch_single_balance(get_coin_info(tendermint_coin_info.ticker));
std::unique_lock lock(m_coin_cfg_mutex);
m_coins_informations[tendermint_coin_info.ticker].currently_enabled = true;
fetch_single_balance(get_coin_info(tendermint_coin_info.ticker));
dispatcher_.trigger<coin_fully_initialized>(coin_fully_initialized{.tickers = {tendermint_coin_info.ticker}});
}
}
}
else
{
SPDLOG_DEBUG("{} failed to activate", rpc.request.ticker);
std::unique_lock lock(m_coin_cfg_mutex);
m_coins_informations[rpc.request.ticker].currently_enabled = false;
update_coin_active({rpc.request.ticker}, false);
@@ -1058,12 +1058,9 @@ namespace atomic_dex
for (const auto& tendermint_token_addresses_info : rpc.result->tendermint_token_balances_infos)
{
dispatcher_.trigger<coin_fully_initialized>(coin_fully_initialized{.tickers = {tendermint_token_addresses_info.first}});
process_balance_answer(rpc);
std::unique_lock lock(m_coin_cfg_mutex);
m_coins_informations[tendermint_token_addresses_info.first].currently_enabled = true;
}
}
process_balance_answer(rpc);
}
};

@@ -1176,7 +1173,6 @@ namespace atomic_dex
{
const auto& answer = rpc.result.value();
kdf::balance_answer balance_answer;

balance_answer.address = answer.balances.begin()->first;
balance_answer.balance = answer.balances.begin()->second.spendable;
balance_answer.coin = answer.platform_coin;
@@ -1193,7 +1189,7 @@ namespace atomic_dex
{
kdf::balance_answer balance_answer;

balance_answer.coin = rpc.request.ticker;
balance_answer.coin = answer.ticker;
balance_answer.balance = answer.tendermint_balances_infos.balances.spendable;
balance_answer.address = answer.address;
{
@@ -1518,10 +1514,18 @@ namespace atomic_dex
{
auto& answer = answers[i];
std::string ticker;
// SPDLOG_DEBUG("batch_balance_and_tx answer: {}", answer.dump(4));

if (batch_array[i].contains("mmrpc") && batch_array[i].at("mmrpc") == "2.0")
{
ticker = batch_array[i].at("params").at("coin");
if (batch_array[i].at("params").contains("coin"))
{
ticker = batch_array[i].at("params").at("coin");
}
else if (batch_array[i].at("params").contains("ticker"))
{
ticker = batch_array[i].at("params").at("ticker");
}
}
else
{