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

[branded dex]: Firo #2403

Draft
wants to merge 88 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
9e57daf
Geoblocking disabled by default
firstcryptoman Oct 11, 2021
d20ce6f
Merge pull request #1 from firoorg/geoblocking
levonpetrosyan93 Oct 11, 2021
7fa8fdd
Merge branch 'KomodoPlatform:dev' into dev
levonpetrosyan93 Oct 11, 2021
52221bb
Set Firo, Bitcoin and Ethereum as default coins
firstcryptoman Oct 19, 2021
b7e6e9c
Merge pull request #2 from firoorg/default_coins_update
levonpetrosyan93 Oct 19, 2021
6bb2bc3
Merge branch 'KomodoPlatform:dev' into dev
levonpetrosyan93 Oct 19, 2021
eb6f9c2
Rebranding AtomicDex to FiroDex
firstcryptoman Nov 24, 2021
c8e6157
Merge pull request #3 from firoorg/rebranding_atomicDex
levonpetrosyan93 Nov 24, 2021
7392efd
Mac os version signing temporarly disabled (#4)
levonpetrosyan93 Nov 26, 2021
bdbd490
Change starting assets and proper discord, twitter links (#5)
firstcryptoman Nov 30, 2021
2b0408a
Merge upstream (#7)
firstcryptoman Dec 6, 2021
66030ce
feat(firodex): start firodex basis
Milerius Dec 11, 2021
e00a0b0
feat(firodex): logos
Milerius Dec 11, 2021
ae3ba44
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Dec 12, 2021
34a161e
Update themes
Dec 12, 2021
4e8587b
Update dark theme
Dec 12, 2021
eab19ee
Merge remote-tracking branch 'origin/dev' into firodex
Dec 12, 2021
4825259
Merge remote-tracking branch 'origin/firodex' into firodex
Dec 12, 2021
6392c56
Udpate light theme
Dec 12, 2021
654fa61
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Dec 12, 2021
e1d0710
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Dec 12, 2021
37b77cd
feat(firodex): use smaller logo
Milerius Dec 13, 2021
ada9da1
Enable tests (#8)
firstcryptoman Dec 13, 2021
39ca296
Update light theme
Dec 16, 2021
5d3b021
Merge branch 'dev' into firodex
Dec 20, 2021
ce27a1d
Update themes
Dec 20, 2021
66ce83e
Merge upstream dev branch
firstcryptoman Dec 20, 2021
0c5f5bb
Merge pull request #1527 from KomodoPlatform/dev
tonymorony Dec 21, 2021
4d3a4a7
Build Fix
firstcryptoman Dec 21, 2021
b93b4bb
Update vcpkg version
firstcryptoman Dec 21, 2021
cdd5373
Fixing build
firstcryptoman Dec 21, 2021
f643c8d
Merge pull request #9 from firoorg/merge_upstream
levonpetrosyan93 Dec 21, 2021
47c4e13
Updateing to new version of vcpkg
firstcryptoman Dec 22, 2021
dfe4303
Updating themes and installer icon
firstcryptoman Dec 22, 2021
3734ace
Merge pull request #10 from firoorg/vcpkg_update
levonpetrosyan93 Dec 22, 2021
9daa4cb
Merge pull request #11 from firoorg/rebrand
levonpetrosyan93 Dec 22, 2021
e8922f7
fix disabled send button
smk762 Dec 23, 2021
9bbed1c
Merge pull request #1528 from KomodoPlatform/smk762-firo-btn
tonymorony Dec 23, 2021
89d3dc9
Updating README
firstcryptoman Dec 27, 2021
f4027a8
Merge pull request #12 from firoorg/readme_update
levonpetrosyan93 Jan 2, 2022
5a26423
Merge branch 'master' of https://github.com/KomodoPlatform/atomicDEX-…
firstcryptoman Jan 2, 2022
d00c836
Merge pull request #13 from firoorg/master_upstream
levonpetrosyan93 Jan 2, 2022
1c44e0c
Merge branch 'dev' of https://github.com/KomodoPlatform/atomicDEX-Des…
Milerius Jan 2, 2022
3db54c0
Fixing conflict (#15)
firstcryptoman Jan 13, 2022
3051254
Company and repository name fixed
levonpetrosyan93 Jan 13, 2022
fb18b6c
Reverting some unneeded changes
levonpetrosyan93 Jan 14, 2022
e350932
feat(firodex): sync with dev
Milerius Feb 10, 2022
ed698aa
Resolve conflicts and sync with upstream
firstcryptoman Feb 12, 2022
1a713d3
Resolving conflicts
firstcryptoman Feb 22, 2022
dcabbda
Merge branch 'KomodoPlatform-firodex' into dev
firstcryptoman Feb 22, 2022
611e4aa
Merge remote-tracking branch 'origin/dev' into firodex
Mar 19, 2022
d2c5bee
Merge branch 'firodex' of https://github.com/KomodoPlatform/atomicDEX…
firstcryptoman Mar 21, 2022
966bf39
Merge pull request #18 from firoorg/merge_upstream
levonpetrosyan93 Mar 21, 2022
64ef3f6
Trying to fix build fails
firstcryptoman Mar 28, 2022
9bffe72
Merge branch 'KomodoPlatform:dev' into dev
firstcryptoman Mar 31, 2022
b8034f2
Adding missing electrumx server (#20)
firstcryptoman Apr 3, 2022
3504b28
Merge pull request #2020 from KomodoPlatform/dev
ca333 Nov 20, 2022
4304392
Merge upstream and resolve conflicts
firstcryptoman Mar 1, 2023
f7f368a
Add default coins, replace STFIRO with KMD
firstcryptoman Mar 1, 2023
75c4d87
Try fix build and fix prev version
firstcryptoman Mar 1, 2023
c46c160
Try fix osx build
firstcryptoman Mar 1, 2023
f0687e5
Fix osx
firstcryptoman Mar 1, 2023
f8ff32a
Try fix windows installer
firstcryptoman Mar 4, 2023
d00d03d
merge upstream dev
firstcryptoman Mar 6, 2023
8aebcf7
Try Fix build
firstcryptoman Mar 6, 2023
4af2a8a
Merge pull request #2159 from KomodoPlatform/dev
smk762 Mar 7, 2023
a6359a6
Config fixes
firstcryptoman Mar 19, 2023
1552444
Merge pull request #26 from firoorg/prepare_0.5.7
firstcryptoman Mar 19, 2023
bea819c
Merge pull request #2246 from KomodoPlatform/dev
smk762 Apr 14, 2023
3b17aa4
Merge pull request #2296 from KomodoPlatform/dev
smk762 Jun 27, 2023
23e0bf0
Merge pull request #2322 from KomodoPlatform/dev
smk762 Jul 10, 2023
5f6101d
Merge pull request #2328 from KomodoPlatform/dev
tonymorony Jul 10, 2023
0ab9ce0
Merge pull request #2363 from KomodoPlatform/dev
smk762 Sep 23, 2023
8c1aa2e
Merge remote-tracking branch 'upstream/master' into upstream_0.6.1
smk762 Sep 24, 2023
ba47993
Merge pull request #31 from firoorg/upstream_0.6.1
levonpetrosyan93 Oct 27, 2023
5d802e3
Merge pull request #2396 from KomodoPlatform/dev
smk762 Dec 22, 2023
0bfa58d
Merge pull request #2398 from KomodoPlatform/dev
smk762 Dec 22, 2023
bcc289a
Merge pull request #2399 from KomodoPlatform/dev
smk762 Dec 22, 2023
c963ef7
Merge branch 'dev' of github.com:firoorg/FiroDEX-Desktop into firoorg…
smk762 Jan 10, 2024
e0eb2a7
fix path for vcpkg
smk762 Jan 10, 2024
9a8c542
try fix cache actions error
smk762 Jan 10, 2024
2547e1e
Merge pull request #2407 from KomodoPlatform/dev
smk762 Jan 20, 2024
a874e1b
Merge branch 'dev' into firoorg-dev
smk762 Jan 20, 2024
28dddc4
Merge pull request #2410 from KomodoPlatform/dev
smk762 Feb 23, 2024
1952847
Merge pull request #2426 from KomodoPlatform/dev
smk762 Apr 10, 2024
056f76f
Merge pull request #2459 from KomodoPlatform/dev
smk762 Jun 24, 2024
7e0837b
Merge branch 'master' into firoorg-dev
smk762 Jul 3, 2024
17394b4
Merge branch 'dev' into firoorg-dev
smk762 Aug 30, 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
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: komodo-wallet-desktop CD releases
name: FiroDex-Desktop CD releases

on:
push:
branches:
- temporary_disabled

env:
DEX_PROJECT_NAME: "komodo-wallet"
DEX_DISPLAY_NAME: "Komodo Wallet"
DEX_COMPANY: "KomodoPlatform"
DEX_PROJECT_NAME: "firodex-desktop"
DEX_DISPLAY_NAME: "FiroDex Desktop"
DEX_COMPANY: "Firo Core Team"
DEX_VERSION: "0.8.0"
DEX_WEBSITE: "https://atomicdex.io/"
DEX_WEBSITE: "https://firo.org/"

jobs:

Expand All @@ -21,6 +21,13 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: setup cache variables
uses: actions/github-script@v6
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

- name: Install QT (Linux/Release)
uses: jurplel/install-qt-action@v2
with:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
name: komodo-wallet-desktop CI
name: FiroDex-Desktop CI

on:
pull_request:
types: [ opened, synchronize, reopened ]
push:
branches:
- dev
- master
schedule:
- cron: '0 0 * * 1'
workflow_dispatch:

env:
DEX_API: "kdf_kwd"
DEX_RPCPORT: 7762
DEX_RPC: "http://127.0.0.1:7762"
DEX_PROJECT_NAME: "komodo-wallet"
DEX_DISPLAY_NAME: "Komodo Wallet"
DEX_COMPANY: "KomodoPlatform"
DEX_API: "kdf_firo"
DEX_RPCPORT: 7653
DEX_RPC: "http://127.0.0.1:7653"
DEX_PROJECT_NAME: "firodex"
DEX_DISPLAY_NAME: "Firo Dex"
DEX_COMPANY: "Firo"
DEX_VERSION: "0.8.0"
DEX_WEBSITE: "https://atomicdex.io/"
DEX_WEBSITE: "https://firo.org/"
VCPKG_DEFAULT_BINARY_CACHE: ${{ github.workspace }}/b/vcpkg_cache
VCPKG_BINARY_SOURCES: clear;x-gha,readwrite
RUNVCPKG_VCPKG_ROOT: ${{ github.workspace }}\komodo-wallet-desktop\ci_tools_atomic_dex\vcpkg-repo
Expand Down Expand Up @@ -85,8 +86,12 @@ jobs:
ref: ${{ github.event.pull_request.head.sha }}
submodules: 'true'

- name: Expose GitHub Runtime Env
uses: crazy-max/ghaction-github-runtime@v2
- name: setup cache variables
uses: actions/github-script@v6
with:
script: |
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');

- name: Setup Python
uses: actions/setup-python@v4
Expand Down Expand Up @@ -116,7 +121,7 @@ jobs:

- name: Install QT (macOS)
if: runner.os == 'macOS'
uses: jurplel/install-qt-action@v3.3.0
uses: jurplel/install-qt-action@v3.0.0
with:
version: ${{ matrix.qt }}
host: ${{ matrix.host }}
Expand All @@ -129,7 +134,7 @@ jobs:

- name: Install QT (Linux)
if: runner.os == 'Linux'
uses: jurplel/install-qt-action@v3.3.0
uses: jurplel/install-qt-action@v3.0.0
with:
version: ${{ matrix.qt }}
host: ${{ matrix.host }}
Expand All @@ -141,7 +146,7 @@ jobs:

- name: Install QT (Windows)
if: runner.os == 'Windows'
uses: jurplel/install-qt-action@v3.3.0
uses: jurplel/install-qt-action@v3.0.0
with:
version: ${{ matrix.qt }}
host: ${{ matrix.host }}
Expand Down Expand Up @@ -197,33 +202,35 @@ jobs:
echo "CC=clang-12" >> $GITHUB_ENV

- name: vcpkg deps (All)
uses: lukka/run-vcpkg@v11
uses: lukka/run-vcpkg@v10
with:
vcpkgDirectory: '${{ github.workspace }}/ci_tools_atomic_dex/vcpkg-repo'
appendedCacheKey: ${{ hashFiles('vcpkg.json') }}
vcpkgJsonGlob: 'vcpkg.json'

- name: import code signing certificates (macos)
if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository
uses: Apple-Actions/import-codesign-certs@v1
with:
keychain: ${{ github.run_id }}
keychain-password: ${{ github.run_id }}
p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}

- name: import installer code signing certificates (macos)
if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository
uses: apple-actions/import-codesign-certs@v1
with:
keychain: ${{ github.run_id }}
keychain-password: ${{ github.run_id }}
create-keychain: false
p12-file-base64: ${{ secrets.CERTIFICATES_INSTALLER_P12 }}
p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}

# - name: import code signing certificates (macos)
# if: runner.os == 'macOS' && 'firoorg/FiroDEX-Desktop' == github.repository
# uses: Apple-Actions/import-codesign-certs@v1
# with:
# keychain: ${{ github.run_id }}
# keychain-password: ${{ github.run_id }}
# p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
# p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}

# - name: import installer code signing certificates (macos)
# if: runner.os == 'macOS' && 'firoorg/FiroDEX-Desktop' == github.repository
# uses: apple-actions/import-codesign-certs@v1
# with:
# keychain: ${{ github.run_id }}
# keychain-password: ${{ github.run_id }}
# create-keychain: false
# p12-file-base64: ${{ secrets.CERTIFICATES_INSTALLER_P12 }}
# p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}


- name: Build Komodo Wallet (MacOS)

- name: Build AtomicDEX (MacOS)
if: runner.os == 'macOS'
run: |
xcrun --sdk macosx --show-sdk-path
Expand All @@ -238,7 +245,6 @@ jobs:
export ASC_PUBLIC_ID="${{ secrets.ASC_PUBLIC_ID }}"
export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/clang_64/lib/cmake
export QT_ROOT=${{ github.workspace }}/Qt/${{ matrix.qt }}
export PATH=/Users/runner/.nimble/bin:$PATH
export MACOSX_DEPLOYMENT_TARGET=10.15
export CC=clang
export CXX=clang++
Expand All @@ -248,7 +254,7 @@ jobs:



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


- name: Build Komodo Wallet (Windows)
- name: Build FiroDEX (Windows)
if: runner.os == 'Windows'
shell: powershell
run: |
Expand All @@ -280,7 +286,6 @@ jobs:
echo "artifact_name_zstd=${{ env.DEX_PROJECT_NAME }}-${{ matrix.name }}-$(git rev-parse --short HEAD).tar.zst" >> $GITHUB_ENV
echo "artifact_name_zip=${{ env.DEX_PROJECT_NAME }}-${{ matrix.name }}-$(git rev-parse --short HEAD).zip" >> $GITHUB_ENV
echo "artifact_name_appimage=${{ env.DEX_PROJECT_NAME }}-${{ matrix.name }}-$(git rev-parse --short HEAD)-x86_64.AppImage" >> $GITHUB_ENV
echo "target_name_zstd=${{ env.DEX_PROJECT_NAME }}-linux-$(git rev-parse --short HEAD).tar.zst" >> $GITHUB_ENV
echo "target_name_zip=${{ env.DEX_PROJECT_NAME }}-linux-$(git rev-parse --short HEAD).zip" >> $GITHUB_ENV
echo "target_name_appimage=${{ env.DEX_PROJECT_NAME }}-linux-$(git rev-parse --short HEAD)-x86_64.AppImage" >> $GITHUB_ENV

Expand Down Expand Up @@ -360,7 +365,7 @@ jobs:
- name: Running Tests (Linux)
working-directory: ci_tools_atomic_dex
continue-on-error: true
if: runner.os == 'Linux' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository
if: runner.os == 'Linux' && 'firoorg/FiroDEX-Desktop' == github.repository
run: |
export REPORT_CI_TOKEN=${{ secrets.REPORT_CI_TOKEN_SECRET }}
export ATOMICDEX_TEST_SEED=${{ secrets.ATOMICDEX_TEST_SEED }}
Expand All @@ -379,7 +384,7 @@ jobs:
- name: Running Tests (MacOS)
working-directory: ci_tools_atomic_dex
continue-on-error: true
if: runner.os == 'macOS' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository
if: runner.os == 'macOS' && 'firoorg/FiroDEX-Desktop' == github.repository
run: |
export MAC_SIGN_IDENTITY="${{ secrets.MAC_SIGN_IDENTITY }}"
export INSTALLER_MAC_SIGN_IDENTITY="${{ secrets.INSTALLER_MAC_SIGN_IDENTITY }}"
Expand All @@ -392,7 +397,6 @@ jobs:
export ATOMICDEX_PASSWORD=${{ secrets.ATOMICDEX_PASSWORD }}
export QT_INSTALL_CMAKE_PATH=${{ github.workspace }}/Qt/${{ matrix.qt }}/clang_64/lib/cmake
export QT_ROOT=${{ github.workspace }}/Qt/${{ matrix.qt }}
export PATH=/Users/runner/.nimble/bin:$PATH
export CC=clang
export CXX=clang++
#echo "Running tests"
Expand All @@ -404,12 +408,12 @@ jobs:
- name: Running Tests (Windows)
shell: powershell
continue-on-error: true
if: runner.os == 'Windows' && 'KomodoPlatform/komodo-wallet-desktop' == github.repository
if: runner.os == 'Windows' && 'firoorg/FiroDEX-Desktop' == github.repository
run: |
#echo "Running tests"
$Env:REPORT_CI_TOKEN = "${{ secrets.REPORT_CI_TOKEN_SECRET }}"
$Env:QT_INSTALL_CMAKE_PATH = "C:\Qt\${{ matrix.qt }}\msvc2019_64"
#cd b\bin
#./${{ env.DEX_PROJECT_NAME }}_tests.exe --reporters=xml --out=${{ env.DEX_PROJECT_NAME }}-tests-result.xml -s
#Invoke-WebRequest -Uri https://report.ci/upload.py -OutFile upload.py
#python upload.py --sha $(git rev-parse HEAD) -n "[Doctest Windows]" --include='${{ env.DEX_PROJECT_NAME }}-tests-result.xml' --framework=doctest --merge ".*"
#python upload.py --sha $(git rev-parse HEAD) -n "[Doctest Windows]" --include='${{ env.DEX_PROJECT_NAME }}-tests-result.xml' --framework=doctest --merge ".*"
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: komodo-wallet-desktop VirustTotal Release
name: FiroDex-Desktop VirustTotal Release

on:
release:
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@
</p>


## What is Komodo Wallet?
## What is FiroDEX?

Komodo Wallet is a secure wallet and non-custodial decentralized exchange rolled into one application. Store your coins,
FiroDEX 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.

Komodo Wallet has been tested on the following platforms:
Expand All @@ -61,8 +61,8 @@ Komodo Wallet has been tested on the following platforms:

## Get Started

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).
You can [download](https://github.com/firoorg/FiroDEX-Desktop/releases) the pre-built <b>beta</b> binaries on
our [GitHub release page](https://github.com/firoorg/FiroDEX-Desktop/releases).

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

Expand Down
6 changes: 4 additions & 2 deletions assets/config/cfg.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
"ETH_ALT": "Ξ",
"BTC": "₿",
"BTC_ALT": "฿",
"LTC": "Ł"
"LTC": "Ł",
"FIRO": "FIRO"
},
"available_fiat": [
"USD",
Expand Down Expand Up @@ -97,6 +98,7 @@
"BTC",
"KMD",
"LTC",
"DOGE"
"DOGE",
"FIRO"
]
}
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": "Komodo Wallet",
"window_title": "firoDEX Desktop",
"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
100644 → 100755
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 removed assets/themes/Binance - Dark/dex-logo-big.png
Binary file not shown.
Binary file removed assets/themes/Binance - Dark/dex-logo.png
Binary file not shown.
Loading
Loading