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

increment version to 0.8.1 #1

Merged
merged 7 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Please describe what you expected to happen.
**Operating Environment(s):**
- OS: [e.g. Windows/OSX/Linux. If Linux, include distro. ]
- OS version: [e.g. 7/10/11, 10.13/10.15, 18.04/20.04 ]
- Komodo Wallet Desktop Version: [e.g. 0.8.0]
- Komodo Wallet Desktop Version: [e.g. 0.8.1]
- Build branch: [e.g. master/dev]


Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/atomicdex-desktop-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
DEX_PROJECT_NAME: "komodo-wallet"
DEX_DISPLAY_NAME: "Komodo Wallet"
DEX_COMPANY: "KomodoPlatform"
DEX_VERSION: "0.8.0"
DEX_VERSION: "0.8.1"
DEX_WEBSITE: "https://atomicdex.io/"

jobs:
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
zip AtomicDEX-Pro-Installer.zip ./installer/AtomicDEX-Pro-Installer

- name: Upload artifacts (Linux)
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: AtomicDEX-Pro-Installer-linux-release
path: ./ci_tools_atomic_dex/AtomicDEX-Pro-Installer.zip
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:
zip AtomicDEX-Pro-Installer.zip ./installer/AtomicDEX-Pro-Installer

- name: Upload artifacts (Linux/Debug)
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: AtomicDEX-Pro-Installer-linux-debug
path: ./ci_tools_atomic_dex/AtomicDEX-Pro-Installer.zip
Expand Down Expand Up @@ -296,7 +296,7 @@ jobs:
ls bundle-Release/atomicDEX-Pro.dmg

- name: Upload artifacts (MacOS/Release)
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: dexpro-mac-release.dmg
path: ./ci_tools_atomic_dex/bundle-Release/atomicDEX-Pro.dmg
Expand Down Expand Up @@ -360,7 +360,7 @@ jobs:
ls bundle-Debug/atomicDEX-Pro.dmg

- name: Upload artifacts (MacOS/Debug)
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: dexpro-mac-debug.dmg
path: ./ci_tools_atomic_dex/bundle-Debug/atomicDEX-Pro.dmg
Expand Down Expand Up @@ -438,7 +438,7 @@ jobs:
ls bundle-Release/bundle.zip

- name: Upload artifacts (Win/Release)
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: dexpro-win-release
path: ./ci_tools_atomic_dex/bundle-Release/bundle.zip
Expand Down Expand Up @@ -516,7 +516,7 @@ jobs:
ls bundle-Debug/bundle.zip

- name: Upload artifacts (Windows/Debug)
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: dexpro-win-debug
path: ./ci_tools_atomic_dex/bundle-Debug/bundle.zip
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/atomicdex-desktop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ env:
DEX_PROJECT_NAME: "komodo-wallet"
DEX_DISPLAY_NAME: "Komodo Wallet"
DEX_COMPANY: "KomodoPlatform"
DEX_VERSION: "0.8.0"
DEX_VERSION: "0.8.1"
DEX_WEBSITE: "https://atomicdex.io/"
VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:

- name: import code signing certificates (macos)
if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository
uses: Apple-Actions/import-codesign-certs@v1
uses: Apple-Actions/import-codesign-certs@v3
with:
keychain: ${{ github.run_id }}
keychain-password: ${{ github.run_id }}
Expand All @@ -213,7 +213,7 @@ jobs:

- name: import installer code signing certificates (macos)
if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository
uses: apple-actions/import-codesign-certs@v1
uses: apple-actions/import-codesign-certs@v3
with:
keychain: ${{ github.run_id }}
keychain-password: ${{ github.run_id }}
Expand All @@ -232,7 +232,7 @@ jobs:
echo $HOME/sdk
ls $HOME/sdk
export MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}"
export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.INSTALLER_MAC_SIGN_IDENTITY }}"
export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}"
export APPLE_ATOMICDEX_PASSWORD="${{ secrets.APPLE_ATOMICDEX_PASSWORD }}"
export APPLE_ID="${{ secrets.APPLE_ID }}"
export ASC_PUBLIC_ID="${{ secrets.ASC_PUBLIC_ID }}"
Expand Down Expand Up @@ -288,23 +288,23 @@ jobs:

- name: Upload bundle artifact (Linux ZSTD)
if: runner.os == 'Linux'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.artifact_name_zstd }}
path: ./bundled/linux/${{ env.target_name_zstd }}
retention-days: 7

- name: Upload bundle artifact (Linux ZIP)
if: runner.os == 'Linux'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.artifact_name_zip }}
path: ./bundled/linux/${{ env.target_name_zip }}
retention-days: 7

- name: Upload bundle artifact (Linux AppImage)
if: runner.os == 'Linux'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.artifact_name_appimage }}
path: ./bundled/linux/${{ env.target_name_appimage }}
Expand All @@ -318,15 +318,15 @@ jobs:

- name: Upload artifacts (MacOS dmg)
if: runner.os == 'macOS'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.artifact_name_dmg }}
path: ./bundled/osx/${{ env.DEX_PROJECT_NAME }}.dmg
retention-days: 7

- name: Upload artifacts (MacOS installer)
if: runner.os == 'macOS'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.artifact_name_installer }}
path: ./bundled/osx/${{ env.DEX_PROJECT_NAME }}_installer.7z
Expand All @@ -341,15 +341,15 @@ jobs:

- name: Upload artifacts (Windows zip)
if: runner.os == 'Windows'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.artifact_name_zip }}
path: ./bundled/windows/${{ env.DEX_PROJECT_NAME }}.zip
retention-days: 7

- name: Upload artifacts (Windows installer)
if: runner.os == 'Windows'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ env.artifact_name_installer }}
path: ./bundled/windows/${{ env.DEX_PROJECT_NAME }}_installer.exe
Expand Down Expand Up @@ -382,7 +382,7 @@ jobs:
if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository
run: |
export MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}"
export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.INSTALLER_MAC_SIGN_IDENTITY }}"
export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}"
export APPLE_ATOMICDEX_PASSWORD="${{ secrets.APPLE_ATOMICDEX_PASSWORD }}"
export APPLE_ID="${{ secrets.APPLE_ID }}"
export ASC_PUBLIC_ID="${{ secrets.ASC_PUBLIC_ID }}"
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include(vcpkg_prerequisites)
include(qt_prerequisites)
include(cfg_hash)

project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.8.0)
project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.8.1)
message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")

include(cmake_default_options)
Expand Down
5 changes: 4 additions & 1 deletion ci_tools_atomic_dex/ci_scripts/osx_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ brew install autoconf \
gnu-sed \
coreutils \
libtool \
llvm \
gnu-getopt

brew unlink python@3.12
brew install llvm
brew link --overwrite python@3.12

pip3 install yq
export CC=clang
export CXX=clang++
Expand Down
2 changes: 1 addition & 1 deletion cmake/project.metadata.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set(DEX_DISPLAY_NAME "Komodo Wallet")
set(DEX_MAINTENANCE_TOOL_NAME "Komodo Wallet Maintenance Tool")
set(DEX_COMPANY "KomodoPlatform")
set(DEX_WEBSITE "https://atomicdex.io/")
set(DEX_VERSION "0.8.0")
set(DEX_VERSION "0.8.1")
set(DEX_SUPPORT_PAGE "https://support.komodoplatform.com/support/home")
set(DEX_DISCORD "https://komodoplatform.com/discord")
set(DEX_TWITTER "https://twitter.com/AtomicDEX")
Expand Down
28 changes: 14 additions & 14 deletions src/core/atomicdex/api/kdf/kdf.client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -205,20 +205,20 @@ namespace atomic_dex::kdf
auto http_request = make_request<Rpc>(request);
generate_client()
.request(http_request, m_token_source.get_token())
.template then([on_rpc_processed, request](const web::http::http_response& resp)
{
try
{
auto rpc = process_rpc_answer<Rpc>(resp);
rpc.request = request;
on_rpc_processed(rpc);
}
catch (const std::exception& ex)
{
// SPDLOG_DEBUG("process_rpc_answer rpc.result: {}", rpc.raw_result);
SPDLOG_ERROR(ex.what());
}
});
.then([on_rpc_processed, request](const web::http::http_response& resp)
{
try
{
auto rpc = process_rpc_answer<Rpc>(resp);
rpc.request = request;
on_rpc_processed(rpc);
}
catch (const std::exception& ex)
{
// SPDLOG_DEBUG("process_rpc_answer rpc.result: {}", rpc.raw_result);
SPDLOG_ERROR(ex.what());
}
});
}

void
Expand Down
2 changes: 1 addition & 1 deletion src/core/atomicdex/models/qt.orderbook.model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ namespace atomic_dex
void
orderbook_model::refresh_orderbook_model_data(const t_orders_contents& orderbook, bool is_bestorders)
{
// SPDLOG_DEBUG("[orderbook_model::refresh_orderbook_model_data], is_bestorders: {}", is_bestorders);
SPDLOG_DEBUG("[orderbook_model::refresh_orderbook_model_data], is_bestorders: {}", is_bestorders);
auto refresh_functor = [this](const std::vector<kdf::order_contents>& contents)
{
for (auto&& order: contents)
Expand Down
2 changes: 2 additions & 0 deletions src/core/atomicdex/models/qt.portfolio.model.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,9 @@ namespace atomic_dex
QJsonObject status = nlohmann_json_object_to_qt_json_object(coin_info.activation_status);
update_value(ActivationStatus, status, idx, *this);
SPDLOG_DEBUG("updated activation status of: {}", ticker);
return true;
}
return false;
}
}

Expand Down
4 changes: 3 additions & 1 deletion src/core/atomicdex/pages/qt.portfolio.page.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,14 @@ namespace atomic_dex
void
portfolio_page::set_chart_category(WalletChartsCategories category)
{
SPDLOG_INFO("new m_current_chart_category: {}", m_current_chart_category);
SPDLOG_INFO("qint32(category): {}", qint32(category));
SPDLOG_INFO("new chart category: {}", QMetaEnum::fromType<WalletChartsCategories>().valueToKey(category));
if (m_current_chart_category != category)
{
m_current_chart_category = category;
QSettings& settings = entity_registry_.ctx<QSettings>();
settings.setValue("WalletChartsCategory", qint32(m_current_chart_category));
settings.setValue("WalletChartsCategory", qint32(category));
if (m_system_manager.get_system<kdf_service>().is_kdf_running() && m_system_manager.has_system<coingecko_wallet_charts_service>())
{
m_system_manager.get_system<coingecko_wallet_charts_service>().manual_refresh("set_chart_category");
Expand Down
2 changes: 1 addition & 1 deletion src/core/atomicdex/pages/qt.portfolio.page.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ namespace atomic_dex
global_coins_cfg_model* m_global_cfg_mdl;
QString m_current_balance_all{"0"};
QString m_main_current_balance_all{"0"};
WalletChartsCategories m_current_chart_category;
WalletChartsCategories m_current_chart_category{WalletChartsCategories::OneMonth};

public:
//! Constructor
Expand Down
2 changes: 1 addition & 1 deletion src/core/atomicdex/pages/qt.settings.page.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ namespace atomic_dex
{
SPDLOG_WARN("Cannot change currency to {} for reason: {}", current_currency.toStdString(), reason);
// Try next in line
int8_t selected_idx = utils::get_index_str(m_config.possible_currencies, current_currency.toStdString());
unsigned long selected_idx = utils::get_index_str(m_config.possible_currencies, current_currency.toStdString());
if (selected_idx < m_config.possible_currencies.size() - 1)
{
set_current_currency(QString::fromStdString(m_config.possible_currencies[selected_idx + 1]));
Expand Down
2 changes: 1 addition & 1 deletion src/core/atomicdex/pages/qt.trading.page.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@ namespace atomic_dex
SPDLOG_WARN("KDF service not available, required to clear forms - skipping");
return;
}
// SPDLOG_DEBUG("clearing forms : {}", from.toStdString());
SPDLOG_DEBUG("clearing forms : {}", from.toStdString());

if (m_preferred_order.has_value() && m_current_trading_mode == TradingModeGadget::Simple &&
m_selected_order_status == SelectedOrderGadget::OrderNotExistingAnymore)
Expand Down
8 changes: 8 additions & 0 deletions src/core/atomicdex/services/price/global.provider.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,14 @@ namespace atomic_dex
global_price_service::refresh_other_coins_rates(
const std::string& quote_id, const std::string& ticker, bool with_update_providers, std::atomic_uint16_t nb_try)
{
SPDLOG_DEBUG("refresh_other_coins_rates: {} - {} - {} - {}", quote_id, ticker, with_update_providers, nb_try);
if (nb_try > 3)
{
SPDLOG_ERROR("Failed to fetch rates for ticker after 3 tries: {}", ticker);
this->m_coin_rate_providers[ticker] = "0.00";
return;
}

t_float_50 price = safe_float(get_rate_conversion("USD", ticker, true));
if (price <= 0)
{
Expand Down
8 changes: 4 additions & 4 deletions src/core/atomicdex/version/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,24 @@ namespace atomic_dex
constexpr const char*
get_version()
{
return "0.8.0-beta";
return "0.8.1-beta";
}

constexpr int
get_num_version() noexcept
{
return 80;
return 81;
}

constexpr const char*
get_raw_version()
{
return "0.8.0";
return "0.8.1";
}

constexpr const char*
get_precedent_raw_version()
{
return "0.7.2";
return "0.8.0";
}
} // namespace atomic_dex
2 changes: 1 addition & 1 deletion vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "komodo-wallet-desktop",
"version-string": "0.8.0",
"version-string": "0.8.1",
"dependencies": [
"entt",
"boost-multiprecision",
Expand Down
Loading