Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
604 commits
Select commit Hold shift + click to select a range
90c6476
Merge pull request #1045 from BlockSettle/wallet_wizard
sergey-chernikov Mar 21, 2023
31f1753
Fixing send behaviour
yzhurko Mar 21, 2023
832c201
Length check to fix errors
yzhurko Mar 21, 2023
e95cef1
[QT-29,32,38,46] advanced dlg option & simple tx & windows icons & nu…
nikitadev0 Mar 21, 2023
4a8a387
Merge pull request #1047 from BlockSettle/number-spacing-and-advanced…
sergey-chernikov Mar 21, 2023
0a5d0ba
[QT-45] remove old network icon and code
nikitadev0 Mar 21, 2023
0a8f9bb
Fixed crash
yzhurko Mar 21, 2023
33c07d0
Merge pull request #1048 from BlockSettle/remove-old-network-icon
sergey-chernikov Mar 21, 2023
0fe4365
Merge pull request #1046 from yzhurko/fix-send
sergey-chernikov Mar 21, 2023
b875c04
[QT-27,38,47] make about dialog & update icons & simple dialog commen…
nikitadev0 Mar 22, 2023
3fe9112
Merge pull request #1049 from BlockSettle/about-dlg-and-simple-dialog…
sergey-chernikov Mar 22, 2023
1b3091f
Plugin popup
yzhurko Mar 19, 2023
53ef189
Dynamic components
yzhurko Mar 19, 2023
38ee0b4
Plugin update
yzhurko Mar 21, 2023
28fd028
[QT-29,45] advanced simple dialog & remove old network icon
nikitadev0 Mar 22, 2023
01eaf91
Merge pull request #1050 from BlockSettle/advanced-simple-dialog-and-…
sergey-chernikov Mar 22, 2023
20396f5
Sideshift buy page
yzhurko Mar 22, 2023
e4d876b
[QT-19,53] update export watching only wallet success dlg & set minim…
nikitadev0 Mar 23, 2023
e12c6e1
Page reset on close
yzhurko Mar 23, 2023
e2f71de
[QT-19,53] fix comments
nikitadev0 Mar 23, 2023
583eb32
Merge pull request #1051 from BlockSettle/export-watching-only-wallet…
sergey-chernikov Mar 23, 2023
c81afc0
Fixed double free
yzhurko Mar 23, 2023
4a37b56
cleanup
yzhurko Mar 23, 2023
7b7ee85
[QT-20,26,53,55] update password change success and fail dialog & cen…
nikitadev0 Mar 23, 2023
e20f8d5
[QT-57] change WO wallet name
sergey-chernikov Mar 23, 2023
1a18975
fix WO export
sergey-chernikov Mar 23, 2023
f3cb17f
Copyright update
yzhurko Mar 23, 2023
193f34d
password integrity check & advanced simple dialog
nikitadev0 Mar 24, 2023
51af8e1
Merge pull request #1052 from BlockSettle/plugins
sergey-chernikov Mar 24, 2023
70871a4
proper validation method name
sergey-chernikov Mar 24, 2023
00e2bf7
proper method name
sergey-chernikov Mar 24, 2023
020be54
Merge branch 'qtquick_gui' into password-success-and-fail-dialog
nikitaromanenko99 Mar 24, 2023
5d7293b
Merge pull request #1053 from BlockSettle/password-success-and-fail-d…
sergey-chernikov Mar 24, 2023
6999e14
qml: send advanced inside app
dvajdual Mar 24, 2023
def14cf
import WO wallet
sergey-chernikov Mar 24, 2023
becd46c
Merge pull request #1055 from BlockSettle/qtquick_gui_qt33
sergey-chernikov Mar 24, 2023
fee11c3
Address filter; plugins stubs; sideswap main page
yzhurko Mar 24, 2023
6820a82
Formatting
yzhurko Mar 24, 2023
501e448
SideSwap MainPage background sizes
yzhurko Mar 24, 2023
ae4c996
Copyrights
yzhurko Mar 24, 2023
abcc6a5
Review fixes
yzhurko Mar 24, 2023
9ac1701
update common
sergey-chernikov Mar 24, 2023
b5513f5
Fixed typo
yzhurko Mar 24, 2023
0d1af7c
Missed translaction
yzhurko Mar 24, 2023
f4f38a4
Merge pull request #1056 from BlockSettle/plugins
sergey-chernikov Mar 24, 2023
a3212cc
[QT-52] TX comments
sergey-chernikov Mar 24, 2023
856223c
Peg-In/Out
yzhurko Mar 25, 2023
1af0fd9
Wallet creation from combobox; view in explorer
yzhurko Mar 26, 2023
eb39d86
new lines
yzhurko Mar 26, 2023
318b37d
[QT-49,54,73] wallet name & delete software wallet & create new wallet
nikitadev0 Mar 27, 2023
84f2936
Merge pull request #1057 from BlockSettle/plugins
sergey-chernikov Mar 27, 2023
955faef
[QT-51] csv file name
nikitadev0 Mar 27, 2023
054c09c
show error on failed import
sergey-chernikov Mar 27, 2023
693a109
fixed add wallet
nikitadev0 Mar 27, 2023
5b25dc1
Merge branch 'qtquick_gui' into create-new-wallet
nikitaromanenko99 Mar 27, 2023
40a8199
[QT-78] wallet rename
sergey-chernikov Mar 27, 2023
dba58f7
fix comments
nikitadev0 Mar 27, 2023
bad99c6
Merge pull request #1058 from BlockSettle/create-new-wallet
sergey-chernikov Mar 27, 2023
5b37630
wallet password validation
sergey-chernikov Mar 28, 2023
58a011c
Bugfix
yzhurko Mar 27, 2023
05e493c
[QT-50] rename wallet
nikitadev0 Mar 28, 2023
bb59698
Merge pull request #1060 from BlockSettle/rename_wallet
sergey-chernikov Mar 28, 2023
0321bb4
Review refactoring
yzhurko Mar 28, 2023
27bc8a4
[QT-65] initial plugin classes
sergey-chernikov Mar 28, 2023
ad740c0
Merge pull request #1059 from BlockSettle/bugfix
sergey-chernikov Mar 28, 2023
5ceef84
[WIP] SideShift.ai plugin implementation
sergey-chernikov Mar 28, 2023
9b20c1b
Wallet properties bugfix
yzhurko Mar 28, 2023
691a91a
Review fixes
yzhurko Mar 29, 2023
76364fb
[QT-19] export w/o wallet
nikitadev0 Mar 29, 2023
e2e43d3
[QT-53] minimum password length
nikitadev0 Mar 29, 2023
0656dff
Merge pull request #1061 from BlockSettle/bugfix
sergey-chernikov Mar 29, 2023
4c55e85
Merge pull request #1062 from BlockSettle/export_wo_wallet
sergey-chernikov Mar 29, 2023
d1f6a4e
Merge branch 'qtquick_gui' into minimum_password_length
sergey-chernikov Mar 29, 2023
32a0f10
Merge pull request #1063 from BlockSettle/minimum_password_length
sergey-chernikov Mar 29, 2023
5116c8d
[QT-55] Import watching only wallet
nikitadev0 Mar 29, 2023
7320cd2
[QT-85] small tweak to wizard
nikitadev0 Mar 29, 2023
870fce1
Merge pull request #1065 from BlockSettle/small_tweak_to_wizard
sergey-chernikov Mar 29, 2023
be2e894
[QT-80] Desktop tray icon
nikitadev0 Mar 29, 2023
cf7bf8c
Currency; network
yzhurko Mar 29, 2023
0d98fe0
Merge pull request #1067 from BlockSettle/bugfix
sergey-chernikov Mar 29, 2023
3329c35
Merge pull request #1066 from BlockSettle/desktop_tray_icon
sergey-chernikov Mar 29, 2023
7d60ba6
[WIP] SideShift.ai plugin implementation - day 2
sergey-chernikov Mar 29, 2023
48f6365
Sideshift small fixes
yzhurko Mar 30, 2023
0a500dd
[QT-83,90] wallet name and wizard popup
nikitadev0 Mar 30, 2023
32df21c
Icon rendering
yzhurko Mar 30, 2023
cd2e706
Combobox fix
yzhurko Mar 30, 2023
0272221
Merge pull request #1069 from BlockSettle/bugfix
sergey-chernikov Mar 30, 2023
7f752d7
Merge pull request #1068 from BlockSettle/wallet_name_and_wizard_popup
sergey-chernikov Mar 30, 2023
bcb5bcb
Sideshift plugin implemented (with MT)
sergey-chernikov Mar 30, 2023
5ac8627
add ubuntu.Dockerfile and some debug about cmake call in generate.py
slava-gen Mar 30, 2023
5ea6676
Merge pull request #1070 from BlockSettle/ubuntu-dockerfile
sergey-chernikov Mar 30, 2023
4a395b9
[QT-19,23,26,49,53,83,90] closing popup on enter & delete wallet
nikitadev0 Mar 31, 2023
e819b8f
adjust debug output for cmake call
slava-gen Mar 31, 2023
879093f
Merge pull request #1073 from BlockSettle/ubuntu-dockerfile
sergey-chernikov Mar 31, 2023
d463f02
fix comments
nikitadev0 Mar 31, 2023
d485ca9
Transaction export; network switches
yzhurko Mar 31, 2023
706afcc
Merge pull request #1072 from BlockSettle/closing_popup_on_enter_and_…
sergey-chernikov Mar 31, 2023
9041797
Merge branch 'qtquick_gui' into bugfix
sergey-chernikov Mar 31, 2023
7dc8c46
Review fixes
yzhurko Mar 31, 2023
a496ed4
fix ommitting qtquickadapter.h
nikitadev0 Mar 31, 2023
958b84d
Merge pull request #1075 from BlockSettle/qtquickadapter_h_omit
sergey-chernikov Mar 31, 2023
8f35071
Merge branch 'qtquick_gui' into bugfix
sergey-chernikov Mar 31, 2023
aa033ac
Refactor success message on transaction export
yzhurko Mar 31, 2023
d4f64fa
String formatting
yzhurko Mar 31, 2023
fe6a2a4
Merge pull request #1074 from BlockSettle/bugfix
sergey-chernikov Mar 31, 2023
d52b5f0
[QT-91] delete watch-only wallet
nikitadev0 Mar 31, 2023
d68ff66
fix comments
nikitadev0 Mar 31, 2023
bf0c67b
Merge pull request #1076 from BlockSettle/delete_watch_only_wallet
sergey-chernikov Mar 31, 2023
d84942f
TX export
sergey-chernikov Apr 2, 2023
441b569
Several fixes
yzhurko Apr 2, 2023
4a28abb
Export transaction fix
yzhurko Apr 2, 2023
657f3e5
[QT-23,82,91,102] Delete Wallet and View Wallet Seed
nikitadev0 Apr 3, 2023
f8be7b4
Merge pull request #1077 from BlockSettle/bugfix
sergey-chernikov Apr 3, 2023
97d1533
[QT-100,101] Advanced Transaction && Create Tx && Fix comments
nikitadev0 Apr 3, 2023
0c85a05
Merge pull request #1078 from BlockSettle/view_wallet_seed_and_delete…
sergey-chernikov Apr 3, 2023
e447d28
[QT-95] seed error
nikitadev0 Apr 3, 2023
212d631
Merge pull request #1079 from BlockSettle/seed_bug
sergey-chernikov Apr 3, 2023
fe981dd
ZC UTXOs on by default
sergey-chernikov Apr 3, 2023
3d6cb8b
removed debug logging
sergey-chernikov Apr 3, 2023
4aa67e5
QT-17 Explorer updates
nikitadev0 Apr 4, 2023
3f55de0
Merge pull request #1080 from BlockSettle/explorer_updates
sergey-chernikov Apr 4, 2023
c9a5c28
Sideshift plugin updates; advances tx max function
yzhurko Apr 4, 2023
716e324
Combobox initialization
yzhurko Apr 5, 2023
23bb229
Removed debug changes
yzhurko Apr 5, 2023
55f837a
Removed unused changes
yzhurko Apr 5, 2023
ab70a79
Review fixes
yzhurko Apr 5, 2023
a65b4be
Merge pull request #1081 from BlockSettle/advanced_transactions
sergey-chernikov Apr 5, 2023
3726a5e
address ledger fixes
sergey-chernikov Apr 6, 2023
1c4e83f
Merge branch 'qtquick_gui' of https://github.com/BlockSettle/terminal…
sergey-chernikov Apr 6, 2023
cd677b1
various fixes
sergey-chernikov Apr 6, 2023
11cee9b
added tx_details deser test
sergey-chernikov Apr 6, 2023
74c308a
update common
sergey-chernikov Apr 7, 2023
f7a72c0
UI bugs; qml warnings
yzhurko Apr 7, 2023
aed0a4a
signed TX export/import
sergey-chernikov Apr 7, 2023
5f5bc23
Merge pull request #1082 from BlockSettle/advanced_transaction
sergey-chernikov Apr 10, 2023
581ab18
Scaling support
yzhurko Apr 12, 2023
920d902
Plugin scaling
yzhurko Apr 12, 2023
80db209
Fixing new sizes
yzhurko Apr 13, 2023
69339bc
Use current screen instead of primary
yzhurko Apr 13, 2023
bbe7811
FeeCombobox fix
yzhurko Apr 13, 2023
abd9453
Property binging for all sizes & rescale on screen change
yzhurko Apr 13, 2023
c3536d2
Merge pull request #1083 from BlockSettle/scaling-support
sergey-chernikov Apr 13, 2023
5a381a5
Removing unused code
yzhurko Apr 13, 2023
a95b23d
Merge pull request #1084 from BlockSettle/scaling-support
sergey-chernikov Apr 13, 2023
c6af902
Scaling splashscreen; trying to fix swipeview layout
yzhurko Apr 14, 2023
52457a6
Merge pull request #1085 from BlockSettle/scaling-support
sergey-chernikov Apr 14, 2023
ffa2574
[QT-106, 109] fixes
sergey-chernikov Apr 14, 2023
4446e3f
Advanced send selection; plugin bugfix
yzhurko Apr 16, 2023
d951f59
Additional check for autoselection
yzhurko Apr 16, 2023
48593f1
Updated casts; returned back set to vector + check for uniqueness
yzhurko Apr 17, 2023
9ae3f1a
Merge pull request #1086 from BlockSettle/bugfix
sergey-chernikov Apr 17, 2023
3ffe586
[QT-110] workaround for Armory issue
sergey-chernikov Apr 17, 2023
37e70b5
Initial QSerialPort implementation for Jade
sergey-chernikov Apr 17, 2023
c077f40
init jade device
sergey-chernikov Apr 17, 2023
d02bd0f
[QT-119] added change output in advanced TX
sergey-chernikov Apr 19, 2023
530c4b9
fix jade detection
sergey-chernikov Apr 19, 2023
60d6c3d
Advanced tranasctions max; wallet selection fix
yzhurko Apr 18, 2023
17ccd4e
Removed debug logs
yzhurko Apr 18, 2023
0f413da
Max transaction on multiple outputs
yzhurko Apr 19, 2023
598f076
Transactions fix; export fix; import transaction
yzhurko Apr 21, 2023
0896bc1
additional new line
yzhurko Apr 21, 2023
4c11f31
Import transaction in wo wallet
yzhurko Apr 21, 2023
8f5ebc5
Review fixes
yzhurko Apr 21, 2023
a6d62ab
Merge pull request #1087 from BlockSettle/bugfix
sergey-chernikov Apr 21, 2023
5200714
Export wallet as pdf; rbf & cpfp fix
yzhurko Apr 23, 2023
e759e9f
Fix review comments
yzhurko Apr 24, 2023
540a4ca
RBF fix; wallet seed increased size
yzhurko Apr 24, 2023
b8513d5
Formatting
yzhurko Apr 25, 2023
a7a3d94
Merge pull request #1088 from BlockSettle/bugfix
sergey-chernikov Apr 25, 2023
88dbc53
Jade wallet import
sergey-chernikov Apr 25, 2023
31f7d4c
Transaction export dialog; wallet selection
yzhurko Apr 27, 2023
6b39dbb
Fixed indent; updated private root key template
yzhurko Apr 27, 2023
89b820c
Using spaces everywhere
yzhurko Apr 27, 2023
55a90b0
Merge pull request #1089 from BlockSettle/bugfix
sergey-chernikov Apr 27, 2023
e37b82b
initial jade signing support
sergey-chernikov Apr 27, 2023
6b6f170
Import transaction with editing; temporary pdf updates
yzhurko Apr 30, 2023
f349383
Postponing transaction export feature
yzhurko May 1, 2023
0933fa4
Merge pull request #1090 from BlockSettle/bugfix
sergey-chernikov May 1, 2023
ff87de1
Upated message dialog; rescan wallet; save pdf button state
yzhurko May 1, 2023
a4eae53
Merge pull request #1091 from BlockSettle/bugfix
sergey-chernikov May 1, 2023
f4cddfe
Wallet rescan fixes
sergey-chernikov May 2, 2023
b13d818
PDF export updates; connection indicator
yzhurko May 3, 2023
921463d
HW wallet import fixes
sergey-chernikov May 3, 2023
9cb149f
Merge pull request #1092 from BlockSettle/bugfix
sergey-chernikov May 3, 2023
bec4422
Allow wallet import while armory is not available
sergey-chernikov May 3, 2023
3629e79
Fee editing
yzhurko May 3, 2023
d39ec6f
Review fix
yzhurko May 4, 2023
688a042
test commit
sergey-chernikov May 4, 2023
7bcf09a
Merge pull request #1093 from BlockSettle/bugfix
sergey-chernikov May 4, 2023
1a52327
Merge branch 'qtquick_gui' of https://github.com/BlockSettle/terminal…
sergey-chernikov May 4, 2023
c34284a
RBF fixes
sergey-chernikov May 5, 2023
87771bb
Bugfix
yzhurko May 7, 2023
47bb2e8
Merge pull request #1094 from BlockSettle/bugfix
sergey-chernikov May 8, 2023
848b848
Networks fix
yzhurko May 8, 2023
c65e7c6
Padding fix
yzhurko May 8, 2023
59ecf2e
Merge pull request #1095 from BlockSettle/bugfix
sergey-chernikov May 8, 2023
516f5c3
RBF fee suggestion fixes
sergey-chernikov May 8, 2023
ac924a2
update common
sergey-chernikov May 9, 2023
434f276
update common
sergey-chernikov May 9, 2023
34961e4
update common
sergey-chernikov May 9, 2023
ca69a50
Network switch; explorer
yzhurko May 9, 2023
9ec6b01
Merge pull request #1097 from BlockSettle/network-fix
sergey-chernikov May 9, 2023
f7f2dab
RBF and CPFP fixes
sergey-chernikov May 9, 2023
b937178
Merge branch 'qtquick_gui' of https://github.com/BlockSettle/terminal…
sergey-chernikov May 9, 2023
18f5071
Make fixed input selected and muted
yzhurko May 10, 2023
a43e047
Review fixes
yzhurko May 10, 2023
77c06d9
Merge pull request #1098 from BlockSettle/fixes-input-selection
sergey-chernikov May 10, 2023
3917cc3
Fixed network modification
yzhurko May 11, 2023
2211780
Add fee in max evaluation; inverted tx list for address search
yzhurko May 11, 2023
115fb06
const iterators
yzhurko May 11, 2023
6db1ccd
Merge pull request #1099 from BlockSettle/network-inputs
sergey-chernikov May 11, 2023
c51d9cb
Merge pull request #1100 from BlockSettle/small-fixes
sergey-chernikov May 11, 2023
b06c40e
some input selection fixes
sergey-chernikov May 12, 2023
636146c
[QT-171] change address fix
sergey-chernikov May 15, 2023
5d6d5ab
address validation fixes
sergey-chernikov May 15, 2023
c83fdd1
[QT-169] fix input selection when last output is removed"
sergey-chernikov May 16, 2023
bcf8cab
[QT-141] export WO wallet from WO as a file copy
sergey-chernikov May 17, 2023
7dbe99a
[QT-165,170] offline signing fixes
sergey-chernikov May 17, 2023
71e0e2a
[QT-155] CPFP mostly working as expected
sergey-chernikov May 18, 2023
31651ce
fix wallet reloading after offline state
sergey-chernikov May 19, 2023
6906db3
fixup
sergey-chernikov May 22, 2023
b1037f9
[QT-143] import/rescan fixes
sergey-chernikov May 23, 2023
e374c82
[QT-178] fix CPFP/RBF inputs selection
sergey-chernikov May 24, 2023
0464b9a
BIP39 backup support from Armory
sergey-chernikov May 31, 2023
abdc252
BIP39 import fixes
sergey-chernikov Jun 6, 2023
1cc5b34
[QT-185] wallet selection after creation/import
sergey-chernikov Jun 7, 2023
45d859c
[QT-183] UTXOs after wallet selection
sergey-chernikov Jun 9, 2023
dc9fc35
[QT-182] proper UTXOs selection for CPFP
sergey-chernikov Jun 14, 2023
994b536
QtQuick app quickfix
BroneCk Jun 15, 2023
dde0c07
Suggestions from sergey fixed
BroneCk Jun 16, 2023
901178b
update script for windows installer creation
slava-gen Jun 16, 2023
a29db1c
Merge pull request #1102 from BlockSettle/qtquick_gui_update_nsis
sergey-chernikov Jun 16, 2023
4617bfb
Merge pull request #1101 from BlockSettle/qtquick_gui_macosfixed
sergey-chernikov Jun 16, 2023
87c20e3
update dockerfile and deb package creation script
slava-gen Jun 16, 2023
ab1b77d
Merge pull request #1103 from BlockSettle/qtquick_gui_deb_package
sergey-chernikov Jun 16, 2023
2d8fc1d
Signature add
BroneCk Jun 23, 2023
34f1696
Linux AppImage generation and unordered_map fix for macos Monterey
BroneCk Jun 24, 2023
ea9521a
libfuse add to dockerfile and nproc to make for faster compile
BroneCk Jun 26, 2023
8f12993
Building witch docker run, not docker build
BroneCk Jun 26, 2023
d826763
sergey comment fix https://github.com/BlockSettle/terminal/pull/1105#…
BroneCk Jun 27, 2023
69e7893
Merge pull request #1105 from BlockSettle/qtquick_gui_macosfixed_sign
sergey-chernikov Jun 27, 2023
edcdd16
fix cicd in part of deb package creations
slava-gen Jun 27, 2023
509dde9
Merge pull request #1106 from BlockSettle/qtquick_gui_cicd_fix
sergey-chernikov Jun 27, 2023
2cc2a05
make CodeSign APPLE exclusive
slava-gen Jul 20, 2023
7f2a12c
Merge pull request #1107 from BlockSettle/qtquick_gui_win_fix
sergey-chernikov Jul 20, 2023
9d94b78
merged common/bs_dev
sergey-chernikov Nov 21, 2023
39fda57
merged common/bs_dev
sergey-chernikov Nov 21, 2023
350e760
various fixes and optimizations
sergey-chernikov Nov 22, 2023
fd840a2
TX list deduplication
sergey-chernikov Nov 23, 2023
8933109
Linux build fixes
sergey-chernikov Nov 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -127,3 +127,13 @@ generated_proto/
terminal.*/
BlockSettleHW/ledger/hidapi/*
GUI/QtWidgets/ui/*

*.autosave

# dvajdual test environment
GUI/QtQuick/main.cpp
GUI/QtQuick/qml/main_test.qml
GUI/QtQuick/qml.qrc
GUI/QtQuick/qml_test.pro
GUI/QtQuick/qml_test.pro.user

75 changes: 75 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
{
"files.associations": {
"map": "cpp",
"iosfwd": "cpp",
"xlocbuf": "cpp",
"ios": "cpp",
"type_traits": "cpp",
"xstring": "cpp",
"xutility": "cpp",
"array": "cpp",
"atomic": "cpp",
"bit": "cpp",
"*.tcc": "cpp",
"bitset": "cpp",
"cctype": "cpp",
"chrono": "cpp",
"cinttypes": "cpp",
"clocale": "cpp",
"cmath": "cpp",
"compare": "cpp",
"concepts": "cpp",
"condition_variable": "cpp",
"csignal": "cpp",
"cstdarg": "cpp",
"cstddef": "cpp",
"cstdint": "cpp",
"cstdio": "cpp",
"cstdlib": "cpp",
"cstring": "cpp",
"ctime": "cpp",
"cwchar": "cpp",
"cwctype": "cpp",
"deque": "cpp",
"list": "cpp",
"set": "cpp",
"string": "cpp",
"unordered_map": "cpp",
"unordered_set": "cpp",
"vector": "cpp",
"exception": "cpp",
"algorithm": "cpp",
"functional": "cpp",
"iterator": "cpp",
"memory": "cpp",
"memory_resource": "cpp",
"numeric": "cpp",
"optional": "cpp",
"random": "cpp",
"ratio": "cpp",
"regex": "cpp",
"string_view": "cpp",
"system_error": "cpp",
"tuple": "cpp",
"utility": "cpp",
"fstream": "cpp",
"future": "cpp",
"initializer_list": "cpp",
"iomanip": "cpp",
"iostream": "cpp",
"istream": "cpp",
"limits": "cpp",
"mutex": "cpp",
"new": "cpp",
"numbers": "cpp",
"ostream": "cpp",
"semaphore": "cpp",
"sstream": "cpp",
"stdexcept": "cpp",
"stop_token": "cpp",
"streambuf": "cpp",
"thread": "cpp",
"typeinfo": "cpp",
"variant": "cpp"
}
}
37 changes: 37 additions & 0 deletions BlockSettleApp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,16 @@ INCLUDE_DIRECTORIES( ${BLOCKSETTLE_UI_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${BS_NETWORK_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${BS_COMMON_ENUMS_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${BS_COMMUNICATION_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${BS_HW_LIB_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${WALLET_LIB_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${CRYPTO_LIB_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${BOTAN_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${Qt5Svg_INCLUDE_DIRS} )

IF ( APPLE )
include(CodeSign)
include(Notarize)

SET( BUNDLE_NAME "BlockSettle Terminal" )

SET( MACOSX_BUNDLE_BUNDLE_NAME ${BUNDLE_NAME} )
Expand All @@ -40,18 +44,51 @@ IF ( APPLE )
SET_SOURCE_FILES_PROPERTIES( ${BS_TERMINAL_ICNS_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
ADD_EXECUTABLE( ${BLOCKSETTLE_APP_NAME} MACOSX_BUNDLE ${SOURCES} ${HEADERS} ${BS_TERMINAL_ICNS_FILE})
SET_TARGET_PROPERTIES( ${BLOCKSETTLE_APP_NAME} PROPERTIES OUTPUT_NAME "${BUNDLE_NAME}" )

code_sign_is_enabled(can_sign)
if (can_sign)
set(FILES_TO_SIGN "${EXECUTABLE_OUTPUT_PATH}/${BUNDLE_NAME}.app")
configure_file(../common/build_scripts/CMakeModules/CodeSignScript.cmake.in sign_app.cmake)
list(APPEND postpkg
COMMAND "${CMAKE_COMMAND}" -E echo "Code signing ${BUNDLE_NAME}.app"
COMMAND "${CMAKE_COMMAND}" -P "sign_app.cmake"
)
add_custom_target(sign
${postpkg}
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
VERBATIM
USES_TERMINAL
)
endif ()

ELSEIF(UNIX AND NOT APPLE)
ADD_EXECUTABLE( ${BLOCKSETTLE_APP_NAME} ${SOURCES} ${HEADERS} )
IF(BUILD_APPIMAGE)
configure_file(../common/build_scripts/CMakeModules/AppImageScript.cmake.in appimage.cmake)
ADD_CUSTOM_COMMAND(TARGET ${BLOCKSETTLE_APP_NAME} POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E echo "Building ${BUNDLE_NAME}.AppImage"
COMMAND "${CMAKE_COMMAND}" -P "appimage.cmake"
)
ENDIF()

ELSEIF ( WIN32 )
ADD_EXECUTABLE( ${BLOCKSETTLE_APP_NAME} WIN32 ${SOURCES} ${HEADERS} blocksettle.rc )

ELSE ()
ADD_EXECUTABLE( ${BLOCKSETTLE_APP_NAME} ${SOURCES} ${HEADERS} )

ENDIF ()

set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath='$ORIGIN'")

TARGET_LINK_LIBRARIES( ${BLOCKSETTLE_APP_NAME}
${TERMINAL_CORE_NAME}
${BLOCKSETTLE_HW_LIBRARY_NAME}
${TERMINAL_GUI_QT_NAME}
${TERMINAL_GUI_QTQUICK_NAME}
${BLOCKSETTLE_UI_LIBRARY_NAME}
${BS_NETWORK_LIB_NAME}
${CURL_LIB}
${CPP_WALLET_LIB_NAME}
${CRYPTO_LIB_NAME}
${BOTAN_LIB}
Expand Down
Binary file modified BlockSettleApp/blocksettle.ico
Binary file not shown.
26 changes: 26 additions & 0 deletions BlockSettleApp/macosapp.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#include <QEvent>
#include <QApplicationStateChangeEvent>
#include "macosapp.h"

MacOsApp::MacOsApp(int &argc, char **argv) : QApplication(argc, argv)
{
// EMPTY CONSTRUCTOR
}
bool MacOsApp::event(QEvent* ev)
{
if (ev->type() == QEvent::ApplicationStateChange) {
auto appStateEvent = static_cast<QApplicationStateChangeEvent*>(ev);

if (appStateEvent->applicationState() == Qt::ApplicationActive) {
if (activationRequired_) {
emit reactivateTerminal();
} else {
activationRequired_ = true;
}
} else {
activationRequired_ = false;
}
}

return QApplication::event(ev);
}
26 changes: 26 additions & 0 deletions BlockSettleApp/macosapp.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#ifndef __MACOSAPP_H__
#define __MACOSAPP_H__

#include <QApplication>
#include <QEvent>
#include <QApplicationStateChangeEvent>

class MacOsApp : public QApplication
{
Q_OBJECT
public:
using QApplication::QApplication;
MacOsApp(int &argc, char **argv); // : QApplication(argc, argv) {}
// ~MacOsApp() override = default;

signals:
void reactivateTerminal();

protected:
bool event(QEvent* ev) override;

private:
bool activationRequired_ = false;
};

#endif
17 changes: 13 additions & 4 deletions BlockSettleApp/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,16 @@
#include "ApiJson.h"
#include "AssetsAdapter.h"
#include "BsServerAdapter.h"
#include "hwdevicemanager.h"
#include "QtGuiAdapter.h"
#include "QtQuickAdapter.h"
#include "SettingsAdapter.h"
#include "SignerAdapter.h"
#include <spdlog/spdlog.h>
#include <spdlog/sinks/daily_file_sink.h>

#include "macosapp.h"

//#include "AppNap.h"

#ifdef USE_QWindowsIntegrationPlugin
Expand All @@ -61,16 +64,19 @@ Q_IMPORT_PLUGIN(QICOPlugin)
Q_IMPORT_PLUGIN(QtQuick2PrivateWidgetsPlugin)
#endif

Q_IMPORT_PLUGIN(QtQmlPlugin)
Q_IMPORT_PLUGIN(QtQuick2Plugin)
Q_IMPORT_PLUGIN(QtQuick2WindowPlugin)
Q_IMPORT_PLUGIN(QtQuickControls2Plugin)
Q_IMPORT_PLUGIN(QtQuick2DialogsPlugin)
Q_IMPORT_PLUGIN(QtQuick2DialogsPrivatePlugin)
Q_IMPORT_PLUGIN(QtQuickTemplates2Plugin)
//Q_IMPORT_PLUGIN(QtQuickControls1Plugin)
Q_IMPORT_PLUGIN(QtQuickControls1Plugin)
Q_IMPORT_PLUGIN(QtQuickLayoutsPlugin)
Q_IMPORT_PLUGIN(QtQmlModelsPlugin)
Q_IMPORT_PLUGIN(QmlFolderListModelPlugin)
Q_IMPORT_PLUGIN(QmlSettingsPlugin)
//Q_IMPORT_PLUGIN(QtLabsPlatformPlugin)
Q_IMPORT_PLUGIN(QtLabsPlatformPlugin)
#endif // STATIC_BUILD

Q_DECLARE_METATYPE(ArmorySettings)
Expand All @@ -86,7 +92,7 @@ Q_DECLARE_METATYPE(UTXO)

#include <QEvent>
#include <QApplicationStateChangeEvent>

/*
class MacOsApp : public QApplication
{
Q_OBJECT
Expand Down Expand Up @@ -120,6 +126,7 @@ class MacOsApp : public QApplication
private:
bool activationRequired_ = false;
};
*/

static void checkStyleSheet(QApplication &app)
{
Expand Down Expand Up @@ -204,14 +211,16 @@ int main(int argc, char** argv)
//inprocBus.addAdapter(std::make_shared<AssetsAdapter>(logMgr->logger()));
inprocBus.addAdapterWithQueue(std::make_shared<WalletsAdapter>(logMgr->logger()
, userWallets, signAdapter->createClient(), userBlockchain), "wallets");
inprocBus.addAdapterWithQueue(std::make_shared<bs::hww::DeviceManager>(
logMgr->logger()), "wallets");
inprocBus.addAdapter(std::make_shared<BsServerAdapter>(logMgr->logger("bscon")));
//inprocBus.addAdapter(std::make_shared<MatchingAdapter>(logMgr->logger("match")));
//inprocBus.addAdapter(std::make_shared<SettlementAdapter>(logMgr->logger("settl")));
//inprocBus.addAdapter(std::make_shared<MktDataAdapter>(logMgr->logger("md")));
//inprocBus.addAdapter(std::make_shared<MDHistAdapter>(logMgr->logger("mdh")));
//inprocBus.addAdapter(std::make_shared<ChatAdapter>(logMgr->logger("chat")));
inprocBus.addAdapterWithQueue(std::make_shared<BlockchainAdapter>(logMgr->logger()
, userBlockchain), /*"blkchain_conn"*/"signer");
, userBlockchain), "signer");

if (!inprocBus.run(argc, argv)) {
logMgr->logger()->error("No runnable adapter found on main inproc bus");
Expand Down
16 changes: 7 additions & 9 deletions BlockSettleHW/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
PROJECT( ${BLOCKSETTLE_HW_LIBRARY_NAME} )

SET(BLOCKSETTLE_HW_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
ADD_DEFINITIONS(-DBUILD_HW_WALLETS)

file(COPY ${THIRD_PARTY_COMMON_DIR}/hidapi/hidapi.h
DESTINATION ${BLOCKSETTLE_HW_ROOT}/ledger/hidapi)
Expand All @@ -22,18 +23,22 @@ FILE(GLOB SOURCES
trezor/*.cpp
ledger/*.cpp
ledger/hidapi/*.c
jade/*.cpp
)

FILE(GLOB HEADERS
*.h
trezor/*.h
ledger/*.h
ledger/hidapi/*.h
jade/*.h
)

INCLUDE_DIRECTORIES( ${WALLET_LIB_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${BS_NETWORK_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( ${COMMON_LIB_INCLUDE_DIR} )
INCLUDE_DIRECTORIES(${BLOCK_SETTLE_ROOT}/Core)
INCLUDE_DIRECTORIES(${CURL_INCLUDE_DIR})

if (UNIX)
INCLUDE_DIRECTORIES( ${LIBUSB_INCLUDE_DIR} )
Expand All @@ -57,19 +62,13 @@ FUNCTION(GENERATE_PROTO IN_DIR OUT_DIR)
SET(PROTO_SOURCE_FILES ${PROTO_SOURCE_FILES} ${PROTO_SOURCE_FILE})
SET(PROTO_HEADER_FILES ${PROTO_HEADER_FILES} ${PROTO_HEADER_FILE})

ADD_CUSTOM_COMMAND(OUTPUT ${PROTO_SOURCE_FILE}
OUTPUT ${PROTO_HEADER_FILE}
DEPENDS ${PROTO_FILE}
COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} ${PROTO_FILE} --cpp_out=${OUT_DIR} --proto_path=${IN_DIR}
WORKING_DIRECTORY ${BLOCKSETTLE_HW_ROOT}
)
EXECUTE_PROCESS(COMMAND ${PROTOBUF_PROTOC_EXECUTABLE} ${PROTO_FILE} --cpp_out ${OUT_DIR} -I ${IN_DIR} --proto_path ${IN_DIR})
ENDFOREACH(PROTO_FILE)

SET(GENERATED_SOURCE_FILES ${GENERATED_SOURCE_FILES} ${PROTO_SOURCE_FILES} PARENT_SCOPE)
SET(GENERATED_HEADER_FILES ${GENERATED_HEADER_FILES} ${PROTO_HEADER_FILES} PARENT_SCOPE)

SET(GENERATED_INCLUDE_DIRS ${GENERATED_INCLUDE_DIRS} ${OUT_DIR} PARENT_SCOPE)

ENDFUNCTION(GENERATE_PROTO)

GENERATE_PROTO("${THIRD_PARTY_COMMON_DIR}/trezorCommon" "${BLOCKSETTLE_HW_ROOT}/trezor/generated_proto")
Expand All @@ -84,7 +83,6 @@ TARGET_LINK_LIBRARIES(${BLOCKSETTLE_HW_LIBRARY_NAME}
${PROTO_LIB}
Qt5::Core
Qt5::Network
Qt5::SerialPort
${OS_SPECIFIC_LIBS}
)


37 changes: 0 additions & 37 deletions BlockSettleHW/hwcommonstructure.cpp

This file was deleted.

Loading