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

0.6.0 #2322

Merged
merged 23 commits into from
Jul 10, 2023
Merged

0.6.0 #2322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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 ]
- AtomicDEX Version: [e.g. 0.5.8]
- Komodo Wallet Version: [e.g. 0.6.0]
- Build branch: [e.g. master/dev]


Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/atomicdex-desktop-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ on:
- temporary_disabled

env:
DEX_PROJECT_NAME: "atomicdex-desktop"
DEX_DISPLAY_NAME: "AtomicDex Desktop"
DEX_PROJECT_NAME: "komodo-wallet"
DEX_DISPLAY_NAME: "Komodo Wallet"
DEX_COMPANY: "KomodoPlatform"
DEX_VERSION: "0.5.8"
DEX_VERSION: "0.6.0"
DEX_WEBSITE: "https://atomicdex.io/"

jobs:
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/atomicdex-desktop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ env:
DEX_API: "mm2"
DEX_RPCPORT: 7762
DEX_RPC: "http://127.0.0.1:7762"
DEX_PROJECT_NAME: "atomicdex-desktop"
DEX_DISPLAY_NAME: "AtomicDex Desktop"
DEX_PROJECT_NAME: "komodo-wallet"
DEX_DISPLAY_NAME: "Komodo Wallet"
DEX_COMPANY: "KomodoPlatform"
DEX_VERSION: "0.5.8"
DEX_VERSION: "0.6.0"
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 @@ -215,7 +215,7 @@ jobs:



- name: Build AtomicDEX (MacOS)
- name: Build Komodo Wallet (MacOS)
if: runner.os == 'macOS'
run: |
xcrun --sdk macosx --show-sdk-path
Expand All @@ -239,7 +239,7 @@ jobs:



- name: Build AtomicDEX (Linux)
- name: Build Komodo Wallet (Linux)
if: runner.os == 'Linux'
run: |
export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/gcc_64/lib/cmake
Expand All @@ -257,7 +257,7 @@ jobs:
./ci_tools_atomic_dex bundle ${{ matrix.type }}


- name: Build AtomicDEX (Windows)
- name: Build Komodo Wallet (Windows)
if: runner.os == 'Windows'
shell: powershell
run: |
Expand Down
20 changes: 10 additions & 10 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ variables:
cache:
- key: $CI_COMMIT_REF_SLUG
paths:
- atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.zip
- atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.tar.zst
- atomicdex-desktop-${CI_COMMIT_SHA::9}-x86_64.AppImage
- komodo-wallet-linux-${CI_COMMIT_SHA::9}.zip
- komodo-wallet-linux-${CI_COMMIT_SHA::9}.tar.zst
- komodo-wallet-${CI_COMMIT_SHA::9}-x86_64.AppImage
- key: $CI_PROJECT_NAME
paths:
- "$CI_PROJECT_DIR/.cache/vcpkg"
Expand Down Expand Up @@ -68,12 +68,12 @@ linux:build:
- rm -rf build_ninja || echo "no build_ninja folder to rm"
- mkdir build_ninja && cd $_
- cmake -DCMAKE_BUILD_TYPE=Release -GNinja ../
- ninja atomicdex-desktop
- ninja install
- ninja komodo-wallet
- cd $CI_PROJECT_DIR
- cp $CI_PROJECT_DIR/bundled/linux/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.zip .
- cp $CI_PROJECT_DIR/bundled/linux/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.tar.zst .
- cp $CI_PROJECT_DIR/bundled/linux/atomicdex-desktop-${CI_COMMIT_SHA::9}-x86_64.AppImage .
- cp $CI_PROJECT_DIR/bundled/linux/komodo-wallet-linux-${CI_COMMIT_SHA::9}.zip .
- cp $CI_PROJECT_DIR/bundled/linux/komodo-wallet-linux-${CI_COMMIT_SHA::9}.tar.zst .
- cp $CI_PROJECT_DIR/bundled/linux/komodo-wallet-${CI_COMMIT_SHA::9}-x86_64.AppImage .

AtomicDex-linux-zip:
stage: upload_linux_zip
Expand All @@ -83,7 +83,7 @@ AtomicDex-linux-zip:
artifacts:
name: "AtomicDex-linux-${CI_COMMIT_SHA::9}.zip"
paths:
- $CI_PROJECT_DIR/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.zip
- $CI_PROJECT_DIR/komodo-wallet-linux-${CI_COMMIT_SHA::9}.zip
when: always
expire_in: 3 days

Expand All @@ -95,7 +95,7 @@ AtomicDex-linux-AppImage:
artifacts:
name: "AtomicDex-linux-${CI_COMMIT_SHA::9}-AppImage"
paths:
- $CI_PROJECT_DIR/atomicdex-desktop-${CI_COMMIT_SHA::9}-x86_64.AppImage
- $CI_PROJECT_DIR/komodo-wallet-${CI_COMMIT_SHA::9}-x86_64.AppImage
when: always
expire_in: 3 days

Expand All @@ -107,6 +107,6 @@ AtomicDex-linux-tar:
artifacts:
name: "AtomicDex-linux-${CI_COMMIT_SHA::9}.tar.zst"
paths:
- $CI_PROJECT_DIR/atomicdex-desktop-linux-${CI_COMMIT_SHA::9}.tar.zst
- $CI_PROJECT_DIR/komodo-wallet-linux-${CI_COMMIT_SHA::9}.tar.zst
when: always
expire_in: 3 days
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.5.8)
project(${DEX_PROJECT_NAME} LANGUAGES CXX VERSION 0.6.0)
message(STATUS "${PROJECT_NAME} is version ${PROJECT_VERSION}")

include(cmake_default_options)
Expand Down
12 changes: 6 additions & 6 deletions CMakeLists.txt.user
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,9 @@
<valuelist type="QVariantList" key="CustomOutputParsers"/>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">atomicdex-desktop</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.atomicdex-desktop</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">atomicdex-desktop</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">komodo-wallet</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.komodo-wallet</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">komodo-wallet</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
Expand Down Expand Up @@ -286,9 +286,9 @@
<valuelist type="QVariantList" key="CustomOutputParsers"/>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">atomicdex-desktop_tests</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.atomicdex-desktop_tests</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">atomicdex-desktop_tests</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">komodo-wallet_tests</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">CMakeProjectManager.CMakeRunConfiguration.komodo-wallet_tests</value>
<value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">komodo-wallet_tests</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
<value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
Expand Down
78 changes: 39 additions & 39 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
<p align="center">
<a href="https://atomicdex.io" alt="AtomicDEX">
<img src="https://user-images.githubusercontent.com/35845239/147651230-827e8c0f-baf0-4f28-8be0-e08624baad37.png" />
<a href="https://atomicdex.io" alt="Komodo Wallet">
<img src="https://user-images.githubusercontent.com/24797699/252289816-fa7d298a-3b7e-4003-956b-bef17f042f9c.png" />
</a>
</p>

<p align="center">
<a href="https://github.com/komodoplatform/atomicdex-desktop/graphs/contributors" alt="Contributors">
<img src="https://img.shields.io/github/contributors/komodoplatform/atomicdex-desktop" />
<a href="https://github.com/komodoplatform/komodo-wallet-desktop/graphs/contributors" alt="Contributors">
<img src="https://img.shields.io/github/contributors/komodoplatform/komodo-wallet-desktop" />
</a>
<a href="https://github.com/komodoplatform/atomicdex-desktop/releases">
<img src="https://img.shields.io/github/downloads/komodoplatform/atomicdex-desktop/total" alt="downloads">
<a href="https://github.com/komodoplatform/komodo-wallet-desktop/releases">
<img src="https://img.shields.io/github/downloads/komodoplatform/komodo-wallet-desktop/total" alt="downloads">
</a>
<a href="https://github.com/komodoplatform/atomicdex-desktop/">
<img src="https://img.shields.io/github/last-commit/komodoplatform/atomicdex-desktop" alt="last commit">
<a href="https://github.com/komodoplatform/komodo-wallet-desktop/">
<img src="https://img.shields.io/github/last-commit/komodoplatform/komodo-wallet-desktop" alt="last commit">
</a>
<a href="https://github.com/komodoplatform/atomicdex-desktop/pulse" alt="Activity">
<img src="https://img.shields.io/github/commit-activity/m/komodoplatform/atomicdex-desktop" />
<a href="https://github.com/komodoplatform/komodo-wallet-desktop/pulse" alt="Activity">
<img src="https://img.shields.io/github/commit-activity/m/komodoplatform/komodo-wallet-desktop" />
</a>
<br/>
<a href="https://github.com/komodoplatform/atomicdex-desktop/issues">
<img src="https://img.shields.io/github/issues-raw/komodoplatform/atomicdex-desktop" alt="issues">
<a href="https://github.com/komodoplatform/komodo-wallet-desktop/issues">
<img src="https://img.shields.io/github/issues-raw/komodoplatform/komodo-wallet-desktop" alt="issues">
</a>
<a href="https://github.com/komodoplatform/atomicdex-desktop/issues?q=is%3Aissue+is%3Aclosed">
<img src="https://img.shields.io/github/issues-closed-raw/komodoplatform/atomicdex-desktop" alt="issues closed">
<a href="https://github.com/komodoplatform/komodo-wallet-desktop/issues?q=is%3Aissue+is%3Aclosed">
<img src="https://img.shields.io/github/issues-closed-raw/komodoplatform/komodo-wallet-desktop" alt="issues closed">
</a>
<a href="https://github.com/komodoplatform/atomicdex-desktop/pulls">
<img src="https://img.shields.io/github/issues-pr/komodoplatform/atomicdex-desktop" alt="pulls">
<a href="https://github.com/komodoplatform/komodo-wallet-desktop/pulls">
<img src="https://img.shields.io/github/issues-pr/komodoplatform/komodo-wallet-desktop" alt="pulls">
</a>
<a href="https://github.com/komodoplatform/atomicdex-desktop/pulls?q=is%3Apr+is%3Aclosed">
<img src="https://img.shields.io/github/issues-pr-closed/komodoplatform/atomicdex-desktop" alt="pulls closed">
<a href="https://github.com/komodoplatform/komodo-wallet-desktop/pulls?q=is%3Apr+is%3Aclosed">
<img src="https://img.shields.io/github/issues-pr-closed/komodoplatform/komodo-wallet-desktop" alt="pulls closed">
</a>
<br/>
<a href="https://github.com/KomodoPlatform/atomicDEX-Desktop/actions">
<img src="https://img.shields.io/github/workflow/status/KomodoPlatform/atomicDEX-Desktop/AtomicDex-Desktop%20CI" alt="build status">
<a href="https://github.com/KomodoPlatform/komodo-wallet-desktop/actions/workflows/atomicdex-desktop-ci.yml">
<img src="https://github.com/KomodoPlatform/komodo-wallet-desktop/actions/workflows/atomicdex-desktop-ci.yml/badge.svg?branch=master" alt="build status">
</a>
<a href="https://github.com/KomodoPlatform/atomicdex-desktop/releases">
<img src="https://img.shields.io/github/v/release/komodoplatform/atomicdex-desktop" alt="release version">
<a href="https://github.com/KomodoPlatform/komodo-wallet-desktop/releases">
<img src="https://img.shields.io/github/v/release/komodoplatform/komodo-wallet-desktop" alt="release version">
</a>
<a href="https://discord.gg/3rzDPAr">
<img src="https://img.shields.io/discord/302123079818149888?logo=discord" alt="chat on Discord">
</a>
<a href="https://twitter.com/intent/follow?screen_name=https://twitter.com/atomicdex">
<img src="https://img.shields.io/twitter/follow/atomicdex?style=social&logo=twitter"
<a href="https://twitter.com/KomodoPlatform">
<img src="https://img.shields.io/twitter/follow/komodoplatform?style=social&logo=twitter"
alt="follow on Twitter">
</a>
</p>


## What is AtomicDEX?
## What is Komodo Wallet?

AtomicDEX is a secure wallet and non-custodial decentralized exchange rolled into one application. Store your coins,
Komodo Wallet is a secure wallet and non-custodial decentralized exchange rolled into one application. Store your coins,
trade peer-to-peer with minimal fees and never give up control over your digital assets.

AtomicDEX Desktop has been tested on the following platforms:
Komodo Wallet has been tested on the following platforms:

- Windows 10
- Linux (Ubuntu 18.04+)
Expand All @@ -61,27 +61,27 @@ AtomicDEX Desktop has been tested on the following platforms:

## Get Started

You can [download](https://github.com/KomodoPlatform/atomicDEX-Desktop/releases) the pre-built <b>beta</b> binaries on
our [GitHub release page](https://github.com/KomodoPlatform/atomicDEX-Desktop/releases).
You can [download](https://github.com/KomodoPlatform/komodo-wallet-desktop/releases) the pre-built <b>beta</b> binaries on
our [GitHub release page](https://github.com/KomodoPlatform/komodo-wallet-desktop/releases).

Build instructions can be found [here](https://github.com/KomodoPlatform/atomicDEX-Desktop/wiki/Build-Instructions)
Build instructions can be found [here](https://github.com/KomodoPlatform/komodo-wallet-desktop/wiki/Build-Instructions)

Please join our [Discord Server](https://komodoplatform.com/discord) for support, discussions and general UI/UX
feedback.


## Useful links

- :book: [AtomicDEX Documentation](https://developers.komodoplatform.com/basic-docs/atomicdex/atomicdex-tutorials/introduction-to-atomicdex.html)
- :link: [AtomicDEX Website](https://atomicdex.io/)
- :speech_balloon: [AtomicDEX Discord](https://discord.gg/tvp96Gf)
- :hammer_and_wrench: [AtomicDEX Development Boards](https://github.com/KomodoPlatform/atomicDEX-Desktop/projects)
- :notebook_with_decorative_cover: [AtomicDex Wiki](https://github.com/KomodoPlatform/atomicDEX-Desktop/wiki/)
- :book: [Komodo Wallet Documentation](https://developers.komodoplatform.com/basic-docs/atomicdex/atomicdex-tutorials/introduction-to-atomicdex.html)
- :link: [Komodo Wallet Website](https://atomicdex.io/)
- :speech_balloon: [Komodo Wallet Discord](https://discord.gg/tvp96Gf)
- :hammer_and_wrench: [Komodo Wallet Development Boards](https://github.com/KomodoPlatform/komodo-wallet-desktop/projects)
- :notebook_with_decorative_cover: [Komodo Wallet Wiki](https://github.com/KomodoPlatform/komodo-wallet-desktop/wiki/)


## AtomicDEX mobile
## Komodo Wallet mobile

Check out AtomicDEX mobile, available for [Android and iOS](https://atomicdex.io)
Check out Komodo Wallet mobile, available for [Android and iOS](https://atomicdex.io)


## Self-Hosted Dependencies
Expand All @@ -103,7 +103,7 @@ Check out AtomicDEX mobile, available for [Android and iOS](https://atomicdex.io


## Contributors / Thanks

<div align="center">
<table>
<tr>
Expand Down Expand Up @@ -151,7 +151,7 @@ Check out AtomicDEX mobile, available for [Android and iOS](https://atomicdex.io
</table>
</div>


## License

For details please refer to our [license](https://github.com/KomodoPlatform/atomicDEX-Desktop/blob/master/LICENSE).
Expand Down
2 changes: 1 addition & 1 deletion assets/config/game.config.maker.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"native_desktop_mode": false,
"scale_mode": "fit",
"window_height": 900.0,
"window_title": "atomicDEX Desktop",
"window_title": "Komodo Wallet",
"window_width": 1280.0,
"no_style": false,
"mouse_grabbed": false,
Expand Down
Binary file modified assets/logo/dex-logo-64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/logo/dex-logo-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/logo/dex-logo.icns
Binary file not shown.
Binary file modified assets/logo/dex-logo.ico
Binary file not shown.
Binary file modified assets/logo/dex-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/logo/dex-tray-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/themes/Binance - Dark/dex-logo-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/themes/Binance - Dark/dex-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/themes/Default - Dark/dex-logo-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/themes/Default - Dark/dex-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/themes/Default - Light/dex-logo-big.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/themes/Default - Light/dex-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading