Compare commits

109 Commits

Author SHA1 Message Date
zxq9 4b15a02fc7 WIP 2026-06-02 23:57:15 +09:00
zxq9 57c5253513 WIP 2026-05-31 11:32:33 +09:00
zxq9 547cbc319d Merge branch 'gajuexpress' of ssh://192.168.7.7:21203/QPQ-AG/GajuDesk into gajuexpress 2026-05-29 17:45:16 +09:00
zxq9 8335e326bd WIP 2026-05-29 17:45:02 +09:00
zxq9 7a65a8c50f Name update 2026-05-28 13:19:38 +09:00
zxq9 c3888d1c2f Merge branch 'gajuexpress' of ssh://git.qpq.swiss:21203/QPQ-AG/GajuDesk into gajuexpress 2026-05-23 17:54:07 +09:00
zxq9 cf4a3856b9 Fix non-existance account dry run problem 2026-05-23 17:53:43 +09:00
zxq9 ed40cc0ac6 WIP 2026-05-22 15:05:57 +09:00
zxq9 14624bfff2 WIP 2026-05-22 08:45:46 +09:00
zxq9 7bd37e972b WIP 2026-05-22 08:12:46 +09:00
zxq9 5885f7f1d7 WIP: Notes 2026-05-21 22:00:10 +09:00
zxq9 170ebcd4eb Add prompt, more resizing 2026-05-21 21:58:18 +09:00
zxq9 2c9d188761 Borders 2026-05-21 20:44:01 +09:00
zxq9 0a217049b1 WIP 2026-05-21 20:05:00 +09:00
zxq9 77ff0ca084 WIP 2026-05-21 14:32:38 +09:00
zxq9 3259e802db Switch to accelerator table hotkeys 2026-05-20 18:53:47 +09:00
zxq9 e0ebfade97 WIP: Need to switch to wxAcceleratorTable 2026-05-19 18:15:25 +09:00
zxq9 e5dcce341e WIP 2026-05-19 14:11:23 +09:00
zxq9 e158706937 WIP 2026-05-19 07:09:29 +09:00
zxq9 7192a35d89 WIP 2026-05-18 21:54:46 +09:00
zxq9 b256db6ff6 Formatting 2026-05-18 21:24:47 +09:00
zxq9 0dde228e6b Fork gen_server 2026-05-18 21:23:16 +09:00
zxq9 9b2fe74e83 Add rider 2026-05-18 13:31:59 +09:00
zxq9 1cab4f5218 WIP 2026-05-18 11:14:35 +09:00
zxq9 6fd62f5cdb WIP 2026-05-17 21:56:13 +09:00
zxq9 821a0a293d WIP 2026-05-17 12:54:08 +09:00
zxq9 bf93fc27b0 WIP 2026-05-17 12:48:10 +09:00
zxq9 127fba5f8f WIP 2026-05-17 12:47:46 +09:00
zxq9 e7478dd35d WIP 2026-05-16 18:54:59 +09:00
zxq9 fb0e33f350 WIP: Adjust procedure description (for now) 2026-05-16 16:45:34 +09:00
zxq9 c4a2f12657 WIP 2026-05-14 14:52:36 +09:00
zxq9 903a32931d Update deps 2026-05-10 18:00:59 +09:00
zxq9 cfafa27c2f Merge pull request 'Make Contract Calls Great Again' (#35) from iface3 into master
Reviewed-on: #35
2026-05-10 15:39:24 +09:00
zxq9 46537a896f Update deps 2026-05-10 15:35:31 +09:00
zxq9 97589a1da5 Remove wx logging junk 2026-05-10 13:31:57 +09:00
zxq9 e5db26ab4c verup 2026-05-10 12:36:44 +09:00
zxq9 28f4a20bc0 Adapt to possible hz outputs for contract source 2026-05-09 21:44:04 +09:00
zxq9 6f9555a7c9 Handle invalid calls slightly better 2026-05-07 19:53:10 +09:00
zxq9 0c9e9805f0 Fix highlighting 2026-05-07 18:43:43 +09:00
zxq9 115ca656ba Marginally better line numbers 2026-05-07 17:04:43 +09:00
zxq9 5a745af71b Line number colors 2026-05-07 16:46:04 +09:00
zxq9 1c59ed413a Line numbers 2026-05-07 16:28:23 +09:00
zxq9 ca933a33db WIP 2026-05-07 12:46:00 +09:00
zxq9 b4dbf21c41 WIP: Fixing silly display cases 2026-05-06 18:31:01 +09:00
zxq9 41bd9eeacd Ajust spacing 2026-05-06 13:10:38 +09:00
zxq9 b071467faa Make Contract Calls Great Again 2026-05-06 12:46:26 +09:00
zxq9 8b390f8d82 WIP 2026-05-05 22:11:14 +09:00
zxq9 2a52516fd3 WIP 2026-05-05 13:47:38 +09:00
zxq9 223552324f WIP: Breaking reminder to add value amounts to total call cost 2026-05-05 00:27:59 +09:00
zxq9 ae8c659c03 WIP: Add gd_con:list_calls/0 and gd_v_call:tx_*/1 2026-05-04 23:58:02 +09:00
zxq9 90d99e1eca WIP 2026-05-03 06:05:18 +09:00
zxq9 ac18ecc916 WIP: De-kajiggering 2026-05-01 14:03:07 +09:00
zxq9 d1ee4c6a24 WIP 2026-04-29 12:55:26 +09:00
zxq9 0a671e7c9c WIP 2026-04-28 18:46:43 +09:00
zxq9 7008195090 WIP 2026-04-28 14:39:37 +09:00
zxq9 24ce75f520 WIP 2026-04-28 14:15:28 +09:00
zxq9 fadc252fb2 WIP 2026-04-27 19:00:47 +09:00
zxq9 a4db8d9a95 WIP 2026-04-07 18:40:17 +09:00
zxq9 acd84d65a8 WIP 2026-04-06 17:28:31 +09:00
zxq9 9365c33351 WIP 2026-04-06 14:42:21 +09:00
zxq9 9fa365e83f WIP 2026-04-06 10:59:45 +09:00
zxq9 713650f88b doodles 2026-02-27 01:34:30 +09:00
zxq9 ae17d21f4f doodles 2026-02-25 16:21:56 +09:00
zxq9 fcf44f55a1 De-snaggle some of the snaggle-toothed save routine nonsense 2026-02-13 15:07:22 +09:00
zxq9 3a570f000e Adapting in the new hz functions 2026-02-12 17:46:52 +09:00
zxq9 34a73a8e99 Fix silly state bug 2026-01-28 19:58:55 +09:00
zxq9 df44118463 WIP 2026-01-08 15:59:46 +09:00
zxq9 f9cb72598f WIP 2026-01-06 19:49:10 +09:00
zxq9 66f5795c49 WIP 2026-01-05 21:06:04 +09:00
zxq9 d2d9ae613e WIP 2026-01-05 15:08:05 +09:00
zxq9 2a52b593bb Merge pull request 'Fix wallet open timer' (#33) from iface into master
Reviewed-on: #33
2025-12-30 23:11:42 +09:00
zxq9 e10236214d Fix wallet open timer 2025-12-30 23:12:43 +09:00
zxq9 b0b3392c91 Adjust timeout. Verup. 2025-12-30 22:49:29 +09:00
zxq9 7697417dd8 Merge pull request 'iface' (#32) from iface into master
Reviewed-on: #32
2025-12-30 22:49:01 +09:00
zxq9 3e638cd100 Pull in out-comment 2025-12-30 22:48:01 +09:00
zxq9 9ea34f43bd Merge pull request 'iface' (#31) from iface into master
Reviewed-on: #31
2025-12-30 22:32:32 +09:00
zxq9 347aec2e46 Merge branch 'master' into iface 2025-12-30 22:25:39 +09:00
zxq9 d59278a26c Drop net* 2025-12-30 18:42:37 +09:00
zxq9 07875ab0e0 Kill spend window 2025-12-30 18:00:37 +09:00
zxq9 03b1f31935 Fix balance check 2025-12-30 17:05:56 +09:00
zxq9 99669a50c7 Catch HZ timeout on balance check 2025-12-30 16:33:32 +09:00
zxq9 52994a12cb Monkeypatch net crash on open 2025-12-30 16:27:29 +09:00
zxq9 8a8bee0bbd WIP 2025-12-27 21:04:30 +09:00
zxq9 39b2e48f68 WIP 2025-12-23 17:02:52 +09:00
zxq9 638c88f900 Dekajigger the kajiggerlicious SpendTX 2025-12-23 15:59:48 +09:00
zxq9 d9acde1b83 WIP :Move formatting functions 2025-12-01 11:52:00 +09:00
zxq9 6a8c4fe1e1 WIP: Add formatter and some other stuff 2025-11-29 14:33:15 +09:00
zxq9 d70f5bb389 WIP 2025-11-19 21:18:18 +09:00
zxq9 d7a8a81fa9 Update zxw dep 2025-11-07 19:56:31 +09:00
zxq9 5a4c934d10 WIP 2025-11-07 18:51:18 +09:00
zxq9 c59ef4b14e WIP 2025-11-07 15:45:57 +09:00
zxq9 bd047a6a46 WIP 2025-11-07 13:13:27 +09:00
zxq9 76f9d074a9 Merge pull request 'binarysign' (#29) from binarysign into master
Reviewed-on: #29
2025-11-01 11:32:03 +09:00
zxq9 07628a71b3 Merge branch 'binarysign' into iface 2025-10-29 16:59:04 +09:00
zxq9 363dfaf271 Update hz dep 2025-10-29 16:16:23 +09:00
zxq9 25550cca32 Verup 2025-10-29 16:15:29 +09:00
zxq9 c452604f4b WIP 2025-10-29 14:05:56 +09:00
zxq9 4446357437 Add interface functions 2025-10-25 12:11:03 +09:00
zxq9 d8b8fee232 WIP: Adding binary signatures 2025-10-25 10:41:32 +09:00
zxq9 6a1c8ecf62 WIP 2025-10-17 19:35:55 +09:00
Jarvis Carroll b8a31e994f factor compile/aaci logic
Instead of removing `init` and changing the definition of what the AACI
is, we can just remove it in the one case that needs `init` removed,
which is load3.
2025-08-22 22:57:12 +10:00
Jarvis Carroll 1d1e735b16 Remove some trace tells
d'oh
2025-08-22 19:59:47 +10:00
Jarvis Carroll 51463b8b74 Make deploy thingy break less 2025-08-22 19:52:42 +10:00
Jarvis Carroll f78d929fb9 Sketchy list, map, variant interface
None of these are quite working right, but the hive contract can open in
the 'open from chain' button now.
2025-08-22 18:38:57 +10:00
zxq9 b4ea4bdf10 Fix bad widget call 2025-08-22 15:24:32 +09:00
Jarvis Carroll dc0b620a4c Make styled text control when loading 2025-08-22 15:22:39 +10:00
Jarvis Carroll 2952822a8f Debug print AACI instead 2025-08-22 14:21:25 +10:00
zxq9 2ecde986bf WIP 2025-08-15 13:24:39 +09:00
zxq9 5ebb532b86 Stop trying to pull the AACI from the build directly 2025-08-14 14:00:47 +09:00
24 changed files with 5341 additions and 2120 deletions
+4 -3
View File
@@ -3,8 +3,9 @@
{registered,[]},
{included_applications,[]},
{applications,[stdlib,kernel,sasl,ssl]},
{vsn,"0.7.0"},
{modules,[gajudesk,gd_con,gd_grids,gd_gui,gd_jt,
gd_sophia_editor,gd_sup,gd_v,gd_v_devman,gd_v_netman,
{vsn,"0.10.0"},
{modules,[gajudesk,gd_con,gd_grids,gd_gui,gd_jt,gd_lib,
gd_m_spend,gd_m_wallet_importer,gd_sophia_editor,
gd_sup,gd_v,gd_v_call,gd_v_devman,gd_v_netman,
gd_v_wallman]},
{mod,{gajudesk,[]}}]}.
+9
View File
@@ -0,0 +1,9 @@
send(Socket, Binary) ->
case gen_tcp:send(Socket, Binary) of
ok ->
ok;
Error ->
ok = tell(info, "Failure on ~w:send/2: ~p", [?MODULE, Error]),
ok = zx_net:disconnect(Socket),
exit(normal)
end.
+5
View File
@@ -0,0 +1,5 @@
% Widgets
-record(w,
{name = none :: string() | atom() | {FunName :: binary(), call | dryr},
id = 0 :: integer(),
wx = none :: none | wx:wx_object()}).
+1 -1
View File
@@ -3,7 +3,7 @@
%%% @end
-module(gajudesk).
-vsn("0.7.0").
-vsn("0.10.0").
-behavior(application).
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <info@qpq.swiss>").
+499 -320
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -37,7 +37,7 @@
%%% @end
-module(gd_grids).
-vsn("0.7.0").
-vsn("0.10.0").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").
+191 -296
View File
@@ -3,7 +3,7 @@
%%% @end
-module(gd_gui).
-vsn("0.7.0").
-vsn("0.10.0").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").
@@ -17,12 +17,7 @@
handle_call/3, handle_cast/2, handle_info/2, handle_event/2]).
-include("$zx_include/zx_logger.hrl").
-include("gd.hrl").
-record(w,
{name = none :: atom(),
id = 0 :: integer(),
wx = none :: none | wx:wx_object()}).
-include("gdl.hrl").
-record(h,
{win = none :: none | wx:wx_object(),
@@ -38,7 +33,7 @@
accounts = [] :: [gajudesk:poa()],
picker = none :: none | wx:wx_object(),
id = {#w{}, #w{}} :: labeled(),
balance = {#w{}, #w{}} :: labeled(),
balance = #w{} :: #w{},
buttons = [] :: [widget()],
history = #h{} :: #h{}}).
@@ -48,6 +43,10 @@
-type labeled() :: {Label :: #w{}, Control :: #w{}}.
-define(openEXPRESS, 101).
-define(openFWEAVER, 102).
%%% Interface functions
@@ -92,21 +91,24 @@ init(Prefs) ->
VSN = proplists:get_value(vsn, ?MODULE:module_info(attributes)),
Wx = wx:new(),
Frame = wxFrame:new(Wx, ?wxID_ANY, AppName ++ " v" ++ VSN),
Panel = wxWindow:new(Frame, ?wxID_ANY),
TopSz = wxBoxSizer:new(?wxVERTICAL),
_ = wxBoxSizer:add(TopSz, Panel, zxw:flags(wide)),
MainSz = wxBoxSizer:new(?wxVERTICAL),
Picker = wxListBox:new(Frame, ?wxID_ANY, [{style, ?wxLC_SINGLE_SEL}]),
Picker = wxListBox:new(Panel, ?wxID_ANY, [{style, ?wxLC_SINGLE_SEL}]),
WallB = wxButton:new(Frame, ?wxID_ANY, [{label, "[none]"}, {style, ?wxBORDER_NONE}]),
WallB = wxButton:new(Panel, ?wxID_ANY, [{label, "[none]"}, {style, ?wxBORDER_NONE}]),
WallW = #w{name = wallet, id = wxButton:getId(WallB), wx = WallB},
ChainB = wxButton:new(Frame, ?wxID_ANY, [{label, "[ChainID]"}, {style, ?wxBORDER_NONE}]),
ChainB = wxButton:new(Panel, ?wxID_ANY, [{label, "[ChainID]"}, {style, ?wxBORDER_NONE}]),
_ = wxButton:disable(ChainB),
ChainW = #w{name = chain, id = wxButton:getId(ChainB), wx = ChainB},
NodeB = wxButton:new(Frame, ?wxID_ANY, [{label, "[Node]"}, {style, ?wxBORDER_NONE}]),
NodeB = wxButton:new(Panel, ?wxID_ANY, [{label, "[Node]"}, {style, ?wxBORDER_NONE}]),
NodeW = #w{name = node, id = wxButton:getId(NodeB), wx = NodeB},
DevB = wxButton:new(Frame, ?wxID_ANY, [{label, "𝑓 () →"}]),
DevB = wxButton:new(Panel, ?wxID_ANY, [{label, "𝑓 () →"}]),
DevW = #w{name = dev, id = wxButton:getId(DevB), wx = DevB},
ID_L = wxStaticText:new(Frame, ?wxID_ANY, J("Account ID: ")),
ID_T = wxStaticText:new(Frame, ?wxID_ANY, ""),
ID_L = wxStaticText:new(Panel, ?wxID_ANY, J("Account ID: ")),
ID_T = wxStaticText:new(Panel, ?wxID_ANY, ""),
ID_W =
{#w{id = wxStaticText:getId(ID_L), wx = ID_L},
#w{id = wxStaticText:getId(ID_T), wx = ID_T}},
@@ -114,18 +116,14 @@ init(Prefs) ->
_ = wxSizer:add(ID_Sz, ID_L, zxw:flags(base)),
_ = wxSizer:add(ID_Sz, ID_T, zxw:flags(wide)),
BalanceL = wxStaticText:new(Frame, ?wxID_ANY, ""),
BalanceT = wxStaticText:new(Frame, ?wxID_ANY, price_to_string(0)),
Balance =
{#w{id = wxStaticText:getId(BalanceL), wx = BalanceL},
#w{id = wxStaticText:getId(BalanceT), wx = BalanceT}},
BalanceT = wxStaticText:new(Panel, ?wxID_ANY, hz_format:amount(0)),
Balance = #w{id = wxStaticText:getId(BalanceT), wx = BalanceT},
BalanceSz = wxBoxSizer:new(?wxHORIZONTAL),
_ = wxSizer:add(BalanceSz, BalanceL, zxw:flags(base)),
_ = wxSizer:add(BalanceSz, BalanceT, zxw:flags(wide)),
NumbersSz = wxBoxSizer:new(?wxVERTICAL),
_ = wxSizer:add(NumbersSz, ID_Sz, zxw:flags(wide)),
_ = wxSizer:add(NumbersSz, BalanceSz, zxw:flags(wide)),
_ = wxSizer:add(NumbersSz, ID_Sz, zxw:flags({wide, 5})),
_ = wxSizer:add(NumbersSz, BalanceSz, zxw:flags({wide, 5})),
ButtonTemplates =
[{make_key, J("Create")},
@@ -142,7 +140,7 @@ init(Prefs) ->
MakeButton =
fun({Name, Label}) ->
B = wxButton:new(Frame, ?wxID_ANY, [{label, Label}]),
B = wxButton:new(Panel, ?wxID_ANY, [{label, Label}]),
#w{name = Name, id = wxButton:getId(B), wx = B}
end,
@@ -167,46 +165,54 @@ init(Prefs) ->
#w{wx = CopyBn} = lists:keyfind(copy, #w.name, Buttons),
#w{wx = WWW_Bn} = lists:keyfind(www, #w.name, Buttons),
_ = wxSizer:add(DetailsSz, NumbersSz, zxw:flags(wide)),
_ = wxSizer:add(DetailsSz, CopyBn, zxw:flags(base)),
_ = wxSizer:add(DetailsSz, WWW_Bn, zxw:flags(base)),
_ = wxSizer:add(DetailsSz, CopyBn, zxw:flags({base, 5})),
_ = wxSizer:add(DetailsSz, WWW_Bn, zxw:flags({base, 5})),
#w{wx = MakeBn} = lists:keyfind(make_key, #w.name, Buttons),
#w{wx = RecoBn} = lists:keyfind(recover, #w.name, Buttons),
#w{wx = MnemBn} = lists:keyfind(mnemonic, #w.name, Buttons),
#w{wx = Rename} = lists:keyfind(rename, #w.name, Buttons),
#w{wx = DropBn} = lists:keyfind(drop_key, #w.name, Buttons),
_ = wxSizer:add(AccountSz, MakeBn, zxw:flags(wide)),
_ = wxSizer:add(AccountSz, RecoBn, zxw:flags(wide)),
_ = wxSizer:add(AccountSz, MnemBn, zxw:flags(wide)),
_ = wxSizer:add(AccountSz, Rename, zxw:flags(wide)),
_ = wxSizer:add(AccountSz, DropBn, zxw:flags(wide)),
_ = wxSizer:add(AccountSz, MakeBn, zxw:flags({wide, 5})),
_ = wxSizer:add(AccountSz, RecoBn, zxw:flags({wide, 5})),
_ = wxSizer:add(AccountSz, MnemBn, zxw:flags({wide, 5})),
_ = wxSizer:add(AccountSz, Rename, zxw:flags({wide, 5})),
_ = wxSizer:add(AccountSz, DropBn, zxw:flags({wide, 5})),
#w{wx = SendBn} = lists:keyfind(send, #w.name, Buttons),
% #w{wx = RecvBn} = lists:keyfind(recv, #w.name, Buttons),
#w{wx = GridsBn} = lists:keyfind(grids, #w.name, Buttons),
_ = wxSizer:add(ActionsSz, SendBn, zxw:flags(wide)),
% _ = wxSizer:add(ActionsSz, RecvBn, zxw:flags(wide)),
_ = wxSizer:add(ActionsSz, GridsBn, zxw:flags(wide)),
_ = wxSizer:add(ActionsSz, SendBn, zxw:flags({wide, 5})),
% _ = wxSizer:add(ActionsSz, RecvBn, zxw:flags({wide, 5})),
_ = wxSizer:add(ActionsSz, GridsBn, zxw:flags({wide, 5})),
#w{wx = Refresh} = lists:keyfind(refresh, #w.name, Buttons),
% HistoryWin = wxScrolledWindow:new(Frame),
% HistoryWin = wxScrolledWindow:new(Panel),
% HistorySz = wxBoxSizer:new(?wxVERTICAL),
% ok = wxScrolledWindow:setSizerAndFit(HistoryWin, HistorySz),
% ok = wxScrolledWindow:setScrollRate(HistoryWin, 5, 5),
_ = wxSizer:add(MainSz, ChainSz, zxw:flags(base)),
_ = wxSizer:add(MainSz, ChainSz, zxw:flags({base, 5})),
_ = wxSizer:add(MainSz, AccountSz, zxw:flags(base)),
_ = wxSizer:add(MainSz, Picker, zxw:flags(wide)),
_ = wxSizer:add(MainSz, Picker, zxw:flags({wide, 5})),
_ = wxSizer:add(MainSz, DetailsSz, zxw:flags(base)),
_ = wxSizer:add(MainSz, ActionsSz, zxw:flags(base)),
_ = wxSizer:add(MainSz, Refresh, zxw:flags(base)),
% _ = wxSizer:add(MainSz, HistoryWin, zxw:flags(wide)),
ok = wxFrame:setSizer(Frame, MainSz),
_ = wxSizer:add(MainSz, Refresh, zxw:flags({base, 5})),
% _ = wxSizer:add(MainSz, HistoryWin, zxw:flags({wide, 5})),
ok = wxWindow:setSizer(Panel, MainSz),
ok = wxFrame:setSizer(Frame, TopSz),
ok = wxSizer:layout(MainSz),
ok = gd_v:safe_size(Frame, Prefs),
HK_Express = wxAcceleratorEntry:new([{flags, ?wxACCEL_NORMAL}, {keyCode, $E}, {cmd, ?openEXPRESS}]),
HK_FWeaver = wxAcceleratorEntry:new([{flags, ?wxACCEL_NORMAL}, {keyCode, $F}, {cmd, ?openFWEAVER}]),
Entries = [HK_Express, HK_FWeaver],
Hotkeys = wxAcceleratorTable:new(length(Entries), Entries),
ok = wxFrame:setAcceleratorTable(Frame, Hotkeys),
ok = lists:foreach(fun wxAcceleratorEntry:destroy/1, Entries),
ok = wxFrame:connect(Frame, command_menu_selected),
ok = wxFrame:connect(Frame, command_button_clicked),
ok = wxFrame:connect(Frame, close_window),
true = wxFrame:show(Frame),
@@ -295,14 +301,14 @@ handle_event(#wx{event = #wxCommand{type = command_button_clicked},
case lists:keyfind(ID, #w.id, Buttons) of
#w{name = wallet} -> wallman(State);
#w{name = chain} -> netman(State);
#w{name = dev} -> devman(State);
#w{name = dev} -> fateweaver(State);
#w{name = node} -> set_node(State);
#w{name = make_key} -> make_key(State);
#w{name = recover} -> recover_key(State);
#w{name = mnemonic} -> show_mnemonic(State);
#w{name = rename} -> rename_key(State);
#w{name = drop_key} -> drop_key(State);
#w{name = copy} -> copy(State);
#w{name = copy} -> copy_pk(State);
#w{name = www} -> www(State);
#w{name = send} -> spend(State);
#w{name = grids} -> grids_dialogue(State);
@@ -316,6 +322,16 @@ handle_event(#wx{event = #wxCommand{type = command_listbox_selected,
State) ->
NewState = do_selection(Selected, State),
{noreply, NewState};
handle_event(#wx{event = #wxCommand{type = command_menu_selected}, id = ID}, State) ->
NewState =
case ID of
?openEXPRESS -> express(State);
?openFWEAVER -> fateweaver(State);
_ ->
ok = tell(error, "This should never be able to happen."),
State
end,
{noreply, NewState};
handle_event(#wx{event = #wxClose{}}, State = #s{frame = Frame, prefs = Prefs}) ->
Geometry =
case wxTopLevelWindow:isMaximized(Frame) of
@@ -337,6 +353,7 @@ handle_event(Event, State) ->
handle_troubling(#s{frame = Frame}, Info) ->
ok = wxFrame:raise(Frame),
zxw:show_message(Frame, Info).
@@ -370,8 +387,17 @@ netman(State) ->
State.
devman(State) ->
ok = gd_con:show_ui(gd_v_devman),
fateweaver(State = #s{accounts = []}) ->
State;
fateweaver(State) ->
ok = gd_con:show_ui(gd_v_fateweaver),
State.
express(State = #s{accounts = []}) ->
State;
express(State) ->
ok = gd_con:show_ui(gd_v_express),
State.
@@ -381,7 +407,7 @@ set_node(State = #s{frame = Frame, j = J}) ->
AddressSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Address")}]),
AddressTx = wxTextCtrl:new(Dialog, ?wxID_ANY),
_ = wxSizer:add(AddressSz, AddressTx, zxw:flags(wide)),
_ = wxSizer:add(AddressSz, AddressTx, zxw:flags({wide, 5})),
PortSz = wxBoxSizer:new(?wxHORIZONTAL),
Labels =
@@ -394,8 +420,8 @@ set_node(State = #s{frame = Frame, j = J}) ->
fun(L) ->
Sz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, L}]),
Tx = wxTextCtrl:new(Dialog, ?wxID_ANY),
_ = wxSizer:add(Sz, Tx, zxw:flags(wide)),
_ = wxSizer:add(PortSz, Sz, zxw:flags(wide)),
_ = wxSizer:add(Sz, Tx, zxw:flags({wide, 5})),
_ = wxSizer:add(PortSz, Sz, zxw:flags({wide, 5})),
Tx
end,
PortCtrls = lists:map(MakePortCtrl, Labels),
@@ -403,16 +429,16 @@ set_node(State = #s{frame = Frame, j = J}) ->
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})),
_ = wxSizer:add(Sizer, AddressSz, zxw:flags(base)),
_ = wxSizer:add(Sizer, AddressSz, zxw:flags({base, 5})),
_ = wxSizer:add(Sizer, PortSz, zxw:flags(base)),
_ = wxSizer:add(Sizer, ButtSz, zxw:flags(wide)),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxBoxSizer:layout(Sizer),
ok = wxDialog:setSize(Dialog, {500, 200}),
ok = wxDialog:setSize(Dialog, {700, 240}),
ok = wxDialog:center(Dialog),
ok = wxStyledTextCtrl:setFocus(AddressTx),
@@ -486,21 +512,21 @@ make_key(State = #s{frame = Frame, j = J}) ->
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})),
_ = wxStaticBoxSizer:add(NameSz, NameTx, zxw:flags(base)),
_ = wxStaticBoxSizer:add(SeedSz, SeedTx, zxw:flags(wide)),
_ = wxStaticBoxSizer:add(OptionsSz, EncodingOptions, zxw:flags(wide)),
_ = wxStaticBoxSizer:add(OptionsSz, TransformOptions, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, NameSz, zxw:flags(base)),
_ = wxBoxSizer:add(Sizer, SeedSz, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, OptionsSz, zxw:flags(base)),
_ = wxStaticBoxSizer:add(NameSz, NameTx, zxw:flags({base, 5})),
_ = wxStaticBoxSizer:add(SeedSz, SeedTx, zxw:flags({wide, 5})),
_ = wxStaticBoxSizer:add(OptionsSz, EncodingOptions, zxw:flags({wide, 5})),
_ = wxStaticBoxSizer:add(OptionsSz, TransformOptions, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, NameSz, zxw:flags({base, 5})),
_ = wxBoxSizer:add(Sizer, SeedSz, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, OptionsSz, zxw:flags({base, 5})),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxBoxSizer:layout(Sizer),
ok = wxFrame:setSize(Dialog, {400, 300}),
ok = wxFrame:setSize(Dialog, {400, 400}),
ok = wxFrame:center(Dialog),
ok = wxStyledTextCtrl:setFocus(NameTx),
@@ -536,13 +562,13 @@ recover_key(State = #s{frame = Frame, j = J}) ->
Sizer = wxBoxSizer:new(?wxVERTICAL),
MnemSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Recovery Phrase")}]),
MnemTx = wxTextCtrl:new(Dialog, ?wxID_ANY, [{style, ?wxTE_MULTILINE}]),
_ = wxStaticBoxSizer:add(MnemSz, MnemTx, zxw:flags(wide)),
_ = wxStaticBoxSizer:add(MnemSz, MnemTx, zxw:flags({wide, 5})),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, MnemSz, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, MnemSz, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxBoxSizer:layout(Sizer),
@@ -576,13 +602,13 @@ show_mnemonic(Selected, State = #s{frame = Frame, j = J, accounts = Accounts}) -
MnemSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Recovery Phrase")}]),
Options = [{value, Mnemonic}, {style, ?wxTE_MULTILINE bor ?wxTE_READONLY}],
MnemTx = wxTextCtrl:new(Dialog, ?wxID_ANY, Options),
_ = wxStaticBoxSizer:add(MnemSz, MnemTx, zxw:flags(wide)),
_ = wxStaticBoxSizer:add(MnemSz, MnemTx, zxw:flags({wide, 5})),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
CloseB = wxButton:new(Dialog, ?wxID_CANCEL, [{label, J("Close")}]),
CopyB = wxButton:new(Dialog, ?wxID_OK, [{label, J("Copy to Clipboard")}]),
_ = wxBoxSizer:add(ButtSz, CloseB, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, CopyB, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, MnemSz, zxw:flags(wide)),
CloseB = wxButton:new(Dialog, ?wxID_CANCEL, [{label, J("Close")}]),
CopyB = wxButton:new(Dialog, ?wxID_OK, [{label, J("Copy to Clipboard")}]),
_ = wxBoxSizer:add(ButtSz, CloseB, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(ButtSz, CopyB, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, MnemSz, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxBoxSizer:layout(Sizer),
@@ -591,7 +617,7 @@ show_mnemonic(Selected, State = #s{frame = Frame, j = J, accounts = Accounts}) -
ok =
case wxDialog:showModal(Dialog) of
?wxID_CANCEL -> ok;
?wxID_OK -> copy_to_clipboard(Mnemonic)
?wxID_OK -> gd_lib:copy_to_clipboard(Mnemonic)
end,
ok = wxDialog:destroy(Dialog),
State.
@@ -607,33 +633,15 @@ rename_key(State = #s{picker = Picker}) ->
rename_key(Selected, State = #s{frame = Frame, j = J, accounts = Accounts}) ->
#poa{id = ID, name = Name} = lists:nth(Selected, Accounts),
Dialog = wxDialog:new(Frame, ?wxID_ANY, J("New Key")),
Sizer = wxBoxSizer:new(?wxVERTICAL),
NameSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Name (Optional)")}]),
NameTx = wxTextCtrl:new(Dialog, ?wxID_ANY),
ok = wxTextCtrl:setValue(NameTx, Name),
_ = wxStaticBoxSizer:add(NameSz, NameTx, zxw:flags(base)),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, NameSz, zxw:flags(base)),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(wide)),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxBoxSizer:layout(Sizer),
ok = wxDialog:setSize(Dialog, {500, 130}),
ok = wxDialog:center(Dialog),
ok = wxStyledTextCtrl:setFocus(NameTx),
Title = J("Rename Key"),
Label = J("New Name"),
Options = [{label, Label}, {init, Name}, selected, empty],
ok =
case wxDialog:showModal(Dialog) of
?wxID_OK ->
NewName = wxTextCtrl:getValue(NameTx),
gd_con:rename_key(ID, NewName);
?wxID_CANCEL ->
ok
case zxw_modal_text:show(Frame, Title, Options) of
{ok, ""} -> gd_con:rename_key(ID, binary_to_list(ID));
{ok, NewName} -> gd_con:rename_key(ID, NewName);
cancel -> ok
end,
ok = wxDialog:destroy(Dialog),
State.
@@ -647,7 +655,7 @@ drop_key(State = #s{picker = Picker}) ->
drop_key(Selected, State = #s{frame = Frame, j = J, accounts = Accounts, prefs = Prefs}) ->
#poa{id = ID, name = Name} = lists:nth(Selected, Accounts),
Dialog = wxDialog:new(Frame, ?wxID_ANY, J("New Key"), [{size, {500, 150}}]),
Dialog = wxDialog:new(Frame, ?wxID_ANY, J("Drop Key"), [{size, {500, 200}}]),
Sizer = wxBoxSizer:new(?wxVERTICAL),
Message = ["REALLY delete key?\r\n\r\n\"", Name, "\"\r\n(", ID, ")"],
MessageT = wxStaticText:new(Dialog, ?wxID_ANY, Message,
@@ -655,9 +663,9 @@ drop_key(Selected, State = #s{frame = Frame, j = J, accounts = Accounts, prefs =
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, MessageT, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, MessageT, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxBoxSizer:layout(Sizer),
@@ -677,28 +685,11 @@ drop_key(Selected, State = #s{frame = Frame, j = J, accounts = Accounts, prefs =
State#s{prefs = NewPrefs}.
copy(State = #s{id = {_, #w{wx = ID_T}}}) ->
copy_pk(State = #s{id = {_, #w{wx = ID_T}}}) ->
String = wxStaticText:getLabel(ID_T),
ok = copy_to_clipboard(String),
ok = gd_lib:copy_to_clipboard(String),
State.
copy_to_clipboard(String) ->
CB = wxClipboard:get(),
case wxClipboard:open(CB) of
true ->
Text = wxTextDataObject:new([{text, String}]),
case wxClipboard:setData(CB, Text) of
true ->
R = wxClipboard:flush(CB),
log(info, "String copied to system clipboard. Flushed: ~p", [R]);
false ->
log(info, "Failed to copy to clipboard")
end,
ok = wxClipboard:close(CB);
false ->
log(info, "Failed to acquire the clipboard.")
end.
www(State = #s{id = {_, #w{wx = ID_T}}, j = J}) ->
case wxStaticText:getLabel(ID_T) of
@@ -743,133 +734,29 @@ spend(Selected, State = #s{accounts = Accounts}) ->
end.
spend2(#poa{id = ID, name = Name}, Nonce, Height, State = #s{frame = Frame, j = J}) ->
Dialog = wxDialog:new(Frame, ?wxID_ANY, J("Transfer"), [{size, {500, 400}}]),
Sizer = wxBoxSizer:new(?wxVERTICAL),
Account = [Name, " (", ID, ")"],
FromTx = wxStaticText:new(Dialog, ?wxID_ANY, Account),
FromSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("From")}]),
_ = wxStaticBoxSizer:add(FromSz, FromTx, zxw:flags(wide)),
ToTx = wxTextCtrl:new(Dialog, ?wxID_ANY),
ToSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("To")}]),
_ = wxStaticBoxSizer:add(ToSz, ToTx, zxw:flags(wide)),
AmtTx = wxTextCtrl:new(Dialog, ?wxID_ANY),
AmtSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Amount")}]),
AmtInSz = wxBoxSizer:new(?wxHORIZONTAL),
AmtLabel = wxStaticText:new(Dialog, ?wxID_ANY, ""),
_ = wxStaticBoxSizer:add(AmtInSz, AmtLabel, zxw:flags(base)),
_ = wxStaticBoxSizer:add(AmtInSz, AmtTx, zxw:flags(wide)),
_ = wxStaticBoxSizer:add(AmtSz, AmtInSz, zxw:flags(wide)),
DataTx = wxTextCtrl:new(Dialog, ?wxID_ANY, [{style, ?wxTE_MULTILINE}]),
DataSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Message (optional)")}]),
_ = wxStaticBoxSizer:add(DataSz, DataTx, zxw:flags(wide)),
Style = [{style, ?wxSL_HORIZONTAL bor ?wxSL_LABELS}],
TTL_Sl = wxSlider:new(Dialog, ?wxID_ANY, 100, 10, 1000, Style),
TTL_Sz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("TTL")}]),
_ = wxStaticBoxSizer:add(TTL_Sz, TTL_Sl, zxw:flags(wide)),
Min = hz:min_gas_price(),
Max = Min * 2,
GasSl = wxSlider:new(Dialog, ?wxID_ANY, Min, Min, Max, Style),
GasSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Gas Price")}]),
_ = wxStaticBoxSizer:add(GasSz, GasSl, zxw:flags(wide)),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, FromSz, zxw:flags(base)),
_ = wxBoxSizer:add(Sizer, ToSz, zxw:flags(base)),
_ = wxBoxSizer:add(Sizer, AmtSz, zxw:flags(base)),
_ = wxBoxSizer:add(Sizer, DataSz, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, TTL_Sz, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, GasSz, zxw:flags(base)),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxBoxSizer:layout(Sizer),
ok = wxFrame:setSize(Dialog, {500, 450}),
ok = wxFrame:center(Dialog),
Args = {Account, J},
ok =
case wxDialog:showModal(Dialog) of
?wxID_OK ->
case gd_m_spend:show(Frame, Args) of
{ok, Partial = #spend_tx{ttl = TTL}} ->
TX =
#spend_tx{sender_id = ID,
recipient_id = wxTextCtrl:getValue(ToTx),
amount = wxTextCtrl:getValue(AmtTx),
gas_price = wxSlider:getValue(GasSl),
gas = 20000,
ttl = Height + wxSlider:getValue(TTL_Sl),
nonce = Nonce,
payload = wxTextCtrl:getValue(DataTx)},
clean_spend(TX);
?wxID_CANCEL ->
Partial#spend_tx{sender_id = ID,
gas = 20000,
ttl = Height + TTL,
nonce = Nonce},
gd_con:spend(TX);
cancel ->
ok
end,
ok = wxDialog:destroy(Dialog),
State.
clean_spend(#spend_tx{recipient_id = ""}) ->
ok;
clean_spend( TX = #spend_tx{amount = S}) when is_list(S) ->
case string_to_price(S) of
{ok, Amount} -> clean_spend(TX#spend_tx{amount = Amount});
{error, _} -> ok
end;
clean_spend(TX = #spend_tx{gas_price = S}) when is_list(S) ->
case is_int(S) of
true -> clean_spend(TX#spend_tx{gas_price = list_to_integer(S)});
false -> ok
end;
clean_spend(TX = #spend_tx{gas = S}) when is_list(S) ->
case is_int(S) of
true -> clean_spend(TX#spend_tx{gas = list_to_integer(S)});
false -> ok
end;
clean_spend(TX = #spend_tx{payload = S}) when is_list(S) ->
clean_spend(TX#spend_tx{payload = list_to_binary(S)});
clean_spend(TX) ->
gd_con:spend(TX).
is_int(S) ->
lists:all(fun(C) -> $0 =< C andalso C =< $9 end, S).
grids_dialogue(State = #s{frame = Frame, j = J}) ->
Dialog = wxDialog:new(Frame, ?wxID_ANY, J("GRIDS URL")),
Sizer = wxBoxSizer:new(?wxVERTICAL),
Label = J("GRIDS URL"),
URL_Sz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J(Label)}]),
URL_Tx = wxTextCtrl:new(Dialog, ?wxID_ANY),
_ = wxStaticBoxSizer:add(URL_Sz, URL_Tx, zxw:flags(wide)),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, URL_Sz, zxw:flags(base)),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(wide)),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxBoxSizer:layout(Sizer),
ok = wxDialog:setSize(Dialog, {500, 130}),
ok = wxDialog:center(Dialog),
ok = wxStyledTextCtrl:setFocus(URL_Tx),
Title = J("GRIDS URL"),
ok =
case wxDialog:showModal(Dialog) of
?wxID_OK ->
case wxTextCtrl:getValue(URL_Tx) of
"" -> ok;
String -> gd_con:grids(String)
end;
?wxID_CANCEL ->
ok
case zxw_modal_text:show(Frame, Title) of
{ok, String} -> gd_con:grids(String);
cancel -> ok
end,
State.
@@ -882,13 +769,13 @@ handle_button(Name, State) ->
do_selection(Selected,
State = #s{prefs = Prefs, accounts = Accounts,
balance = {_, #w{wx = B}}, id = {_, #w{wx = I}}})
balance = #w{wx = B}, id = {_, #w{wx = I}}})
when Selected < length(Accounts) ->
OneBasedIndex = Selected + 1,
#poa{id = ID, balances = Balances} = lists:nth(OneBasedIndex, Accounts),
[#balance{total = Pucks}] = Balances,
ok = wxStaticText:setLabel(I, ID),
ok = wxStaticText:setLabel(B, price_to_string(Pucks)),
ok = wxStaticText:setLabel(B, hz_format:amount(Pucks)),
ok = gd_con:selected(OneBasedIndex),
NewPrefs = maps:put(selected, Selected, Prefs),
State#s{prefs = NewPrefs};
@@ -915,7 +802,7 @@ do_show(Accounts, State = #s{sizer = Sizer, prefs = Prefs, picker = Picker}) ->
ok = wxSizer:layout(Sizer),
NewState.
clear_account(State = #s{balance = {_, #w{wx = B}}, id = {_, #w{wx = I}}}) ->
clear_account(State = #s{balance = #w{wx = B}, id = {_, #w{wx = I}}}) ->
ok = wxStaticText:setLabel(I, ""),
ok = wxStaticText:setLabel(B, ""),
State.
@@ -969,12 +856,12 @@ do_ask_password(#s{frame = Frame, prefs = Prefs, j = J}) ->
Label = J("Password (leave blank for no password)"),
PassSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, Label}]),
PassTx = wxTextCtrl:new(Dialog, ?wxID_ANY),
_ = wxStaticBoxSizer:add(PassSz, PassTx, zxw:flags(wide)),
_ = wxStaticBoxSizer:add(PassSz, PassTx, zxw:flags({wide, 5})),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, PassSz, zxw:flags(base)),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, PassSz, zxw:flags({base, 5})),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags({base, 5})),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxBoxSizer:layout(Sizer),
ok = wxFrame:center(Dialog),
@@ -1031,24 +918,66 @@ do_grids_mess_sig2(Request = #{"grids" := 1,
InstTx = wxStaticText:new(Dialog, ?wxID_ANY, Instruction),
AcctSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Signature Account")}]),
AcctTx = wxStaticText:new(Dialog, ?wxID_ANY, ID),
_ = wxStaticBoxSizer:add(AcctSz, AcctTx, zxw:flags(wide)),
_ = wxStaticBoxSizer:add(AcctSz, AcctTx, zxw:flags({wide, 5})),
URL_Label = J("Originating URL"),
URL_Sz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, URL_Label}]),
URL_Tx = wxStaticText:new(Dialog, ?wxID_ANY, URL),
_ = wxStaticBoxSizer:add(URL_Sz, URL_Tx, zxw:flags(wide)),
_ = wxStaticBoxSizer:add(URL_Sz, URL_Tx, zxw:flags({wide, 5})),
MessSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Message")}]),
MessStyle = ?wxTE_MULTILINE bor ?wxTE_READONLY,
MessTx = wxTextCtrl:new(Dialog, ?wxID_ANY, [{value, Message}, {style, MessStyle}]),
_ = wxStaticBoxSizer:add(MessSz, MessTx, zxw:flags(wide)),
_ = wxStaticBoxSizer:add(MessSz, MessTx, zxw:flags({wide, 5})),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, InstTx, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, AcctSz, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, URL_Sz, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, MessSz, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, InstTx, zxw:flags({base, 5})),
_ = wxBoxSizer:add(Sizer, AcctSz, zxw:flags({base, 5})),
_ = wxBoxSizer:add(Sizer, URL_Sz, zxw:flags({base, 5})),
_ = wxBoxSizer:add(Sizer, MessSz, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxDialog:setSize(Dialog, {600, 300}),
ok = wxBoxSizer:layout(Sizer),
ok = wxFrame:center(Dialog),
ok =
case wxDialog:showModal(Dialog) of
?wxID_OK -> gd_con:sign_mess(Request);
?wxID_CANCEL -> ok
end,
wxDialog:destroy(Dialog);
do_grids_mess_sig2(Request = #{"grids" := 1,
"type" := "binary",
"url" := URL,
"public_id" := ID,
"payload" := Base64},
#s{frame = Frame, j = J}) ->
Dialog = wxDialog:new(Frame, ?wxID_ANY, J("Binary Data Signature Request")),
Sizer = wxBoxSizer:new(?wxVERTICAL),
Instruction =
J("The server at the URL below is requesting you sign the following binary data."),
InstTx = wxStaticText:new(Dialog, ?wxID_ANY, Instruction),
AcctSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Signature Account")}]),
AcctTx = wxStaticText:new(Dialog, ?wxID_ANY, ID),
_ = wxStaticBoxSizer:add(AcctSz, AcctTx, zxw:flags({wide, 5})),
URL_Label = J("Originating URL"),
URL_Sz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, URL_Label}]),
URL_Tx = wxStaticText:new(Dialog, ?wxID_ANY, URL),
_ = wxStaticBoxSizer:add(URL_Sz, URL_Tx, zxw:flags({wide, 5})),
MessSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Base-64 Data")}]),
MessStyle = ?wxTE_MULTILINE bor ?wxTE_READONLY,
MessTx = wxTextCtrl:new(Dialog, ?wxID_ANY, [{value, Base64}, {style, MessStyle}]),
_ = wxStaticBoxSizer:add(MessSz, MessTx, zxw:flags({wide, 5})),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, InstTx, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, AcctSz, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, URL_Sz, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, MessSz, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxDialog:setSize(Dialog, {500, 500}),
@@ -1056,7 +985,7 @@ do_grids_mess_sig2(Request = #{"grids" := 1,
ok = wxFrame:center(Dialog),
ok =
case wxDialog:showModal(Dialog) of
?wxID_OK -> gd_con:sign_mess(Request);
?wxID_OK -> gd_con:sign_binary(Request);
?wxID_CANCEL -> ok
end,
wxDialog:destroy(Dialog);
@@ -1089,7 +1018,7 @@ do_grids_mess_sig2(Request = #{"grids" := 1,
_ = wxFlexGridSizer:add(DetailSz, T)
end,
ok = lists:foreach(AddDetail, Details),
_ = wxStaticBoxSizer:add(LabeledSz, DetailSz, zxw:flags(wide)),
_ = wxStaticBoxSizer:add(LabeledSz, DetailSz, zxw:flags({wide, 5})),
DataLabel = wxStaticText:new(Dialog, ?wxID_ANY, J("TX Data")),
DataStyle = ?wxTE_MULTILINE bor ?wxTE_READONLY,
@@ -1098,14 +1027,14 @@ do_grids_mess_sig2(Request = #{"grids" := 1,
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, TitleTx, zxw:flags(base)),
_ = wxBoxSizer:add(Sizer, LabeledSz, zxw:flags(base)),
_ = wxBoxSizer:add(Sizer, DataLabel, zxw:flags(base)),
_ = wxBoxSizer:add(Sizer, DataTx, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)),
_ = wxBoxSizer:add(Sizer, TitleTx, zxw:flags({base, 5})),
_ = wxBoxSizer:add(Sizer, LabeledSz, zxw:flags({base, 5})),
_ = wxBoxSizer:add(Sizer, DataLabel, zxw:flags({base, 5})),
_ = wxBoxSizer:add(Sizer, DataTx, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags({base, 5})),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxDialog:setSize(Dialog, {700, 400}),
ok = wxBoxSizer:layout(Sizer),
@@ -1118,37 +1047,3 @@ do_grids_mess_sig2(Request = #{"grids" := 1,
wxDialog:destroy(Dialog);
do_grids_mess_sig2(BadRequest, _) ->
tell("Bad request: ~tp", [BadRequest]).
%%% Helpers
price_to_string(Pucks) ->
Gaju = 1_000_000_000_000_000_000,
H = integer_to_list(Pucks div Gaju),
R = Pucks rem Gaju,
case string:strip(lists:flatten(io_lib:format("~18..0w", [R])), right, $0) of
[] -> H;
T -> string:join([H, T], ".")
end.
string_to_price(String) ->
case string:split(String, ".") of
[H] -> join_price(H, "0");
[H, T] -> join_price(H, T);
_ -> {error, bad_price}
end.
join_price(H, T) ->
try
Parts = [H, string:pad(T, 18, trailing, $0)],
Price = list_to_integer(unicode:characters_to_list(Parts)),
case Price < 0 of
false -> {ok, Price};
true -> {error, negative_price}
end
catch
error:R -> {error, R}
end.
+1 -1
View File
@@ -15,7 +15,7 @@
%%% translation library is retained).
-module(gd_jt).
-vsn("0.7.0").
-vsn("0.10.0").
-export([read_translations/1, j/2, oneshot_j/2]).
+104
View File
@@ -0,0 +1,104 @@
%%% @doc
%%% GajuDesk Helper Functions
%%% @end
-module(gd_lib).
-vsn("0.10.0").
-include_lib("wx/include/wx.hrl").
-export([is_int/1,
mono_text/2, mono_text/3, mono_text/4,
button/2, button/3,
copy_to_clipboard/1]).
-include("$zx_include/zx_logger.hrl").
-include("gd.hrl").
-include("gdl.hrl").
-spec is_int(string()) -> boolean().
%% @doc
%% A simple boolean check over whether every character in a string is part of an integer value
%% without the trashy `try .. catch' way.
is_int(S) ->
lists:all(fun(C) -> $0 =< C andalso C =< $9 end, S).
-spec mono_text(Parent, Name) -> StaticText
when Parent :: wxWindow:wxWindow(),
Name :: term(),
StaticText :: #wx{}.
%% @doc
%% Creates a blank monospace font static text field.
%% @equiv mono_text(Parent, Name, "").
mono_text(Parent, Name) ->
mono_text(Parent, Name, "").
-spec mono_text(Parent, Name, Value) -> StaticText
when Parent :: wxWindow:wxWindow(),
Name :: term(),
Value :: string(),
StaticText :: #w{}.
%% @doc
%% Creats a monospace font static text field with the given value.
%% This exists so that I don't have to remember the difference between how to create a styled
%% wxStaticText vs wxTextCtrl (which has to do it in a weird way because it has a much richer
%% notion of text styling).
mono_text(Parent, Name, Value) ->
mono_text(Parent, Name, Value, []).
mono_text(Parent, Name, Value, Options) ->
Text = wxTextCtrl:new(Parent, ?wxID_ANY, [{value, Value} | Options]),
Font = wxFont:new(10, ?wxFONTFAMILY_TELETYPE, ?wxFONTSTYLE_NORMAL, ?wxFONTWEIGHT_NORMAL),
ok =
case wxTextCtrl:setFont(Text, Font) of
true -> ok;
false -> tell(info, "wxStaticText ~p is already monospace.", [Text])
end,
#w{name = Name, id = wxTextCtrl:getId(Text), wx = Text}.
-spec button(Parent, Label) -> Button
when Parent :: wxWindow:wxWindow(),
Label :: string(),
Button :: #w{}.
button(Parent, Label) ->
button(Parent, Label, Label).
-spec button(Parent, Name, Label) -> Button
when Parent :: wxWindow:wxWindow(),
Name :: term(),
Label :: string(),
Button :: #wx{}.
button(Parent, Name, Label) ->
Button = wxButton:new(Parent, ?wxID_ANY, [{label, Label}]),
#w{name = Name, id = wxButton:getId(Button), wx = Button}.
-spec copy_to_clipboard(String) -> ok
when String :: unicode:charlist().
copy_to_clipboard(String) ->
CB = wxClipboard:get(),
case wxClipboard:open(CB) of
true ->
Text = wxTextDataObject:new([{text, String}]),
case wxClipboard:setData(CB, Text) of
true ->
R = wxClipboard:flush(CB),
log(info, "String copied to system clipboard. Flushed: ~p", [R]);
false ->
log(info, "Failed to copy to clipboard")
end,
ok = wxClipboard:close(CB);
false ->
log(info, "Failed to acquire the clipboard.")
end.
+284
View File
@@ -0,0 +1,284 @@
%%% @doc
%%% A live modal for creating a SpendTX
%%% @end
-module(gd_m_spend).
-vsn("0.10.0").
-author("Craig Everett <zxq9@zxq9.com>").
-copyright("Craig Everett <zxq9@zxq9.com>").
-license("GPL-3.0-or-later").
%-behavior(zxw_modal).
-export([show/2]).
-export([init/1, handle_info/2, handle_event/2]).
-include_lib("wx/include/wx.hrl").
-include("$zx_include/zx_logger.hrl").
-include("gd.hrl").
-record(s,
{frame = none :: none | wx:wx_object(),
parent = none :: none | wx:wx_object(),
caller = none :: none | pid(),
j = j() :: fun(),
to_tx = none :: none | wx:wx_object(),
amount_tx = none :: none | wx:wx_object(),
payload_tx = none :: none | wx:wx_object(),
ttl_sl = none :: none | wx:wx_object(),
gas_sl = none :: none | wx:wx_object(),
affirm = none :: none | wx:wx_object(),
cancel = none :: none | wx:wx_object()}).
j() ->
fun(X) -> X end.
%%% Interface
-spec show(Parent, Args) -> {ok, #spend_tx{}} | cancel
when Parent :: wxFrame:wxFrame(),
Args :: {Account :: iolist(),
Nonce :: pos_integer(),
Height :: pos_integer(),
J :: fun()}.
show(Parent, Args) ->
zxw_modal:show(Parent, ?MODULE, Args).
%% Init
init({Parent, Caller, {Account, J}}) ->
Frame = wxFrame:new(Parent, ?wxID_ANY, J("Transfer Gajus")),
Panel = wxWindow:new(Frame, ?wxID_ANY),
TopSz = wxBoxSizer:new(?wxVERTICAL),
_ = wxBoxSizer:add(TopSz, Panel, zxw:flags(wide)),
MainSz = wxBoxSizer:new(?wxVERTICAL),
FromTx = wxStaticText:new(Panel, ?wxID_ANY, Account),
FromSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, J("From")}]),
_ = wxStaticBoxSizer:add(FromSz, FromTx, zxw:flags({wide, 5})),
ToTx = wxTextCtrl:new(Panel, ?wxID_ANY),
ToSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, J("To")}]),
_ = wxStaticBoxSizer:add(ToSz, ToTx, zxw:flags({wide, 5})),
AmtTx = wxTextCtrl:new(Panel, ?wxID_ANY),
AmtSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, J("Amount")}]),
AmtInSz = wxBoxSizer:new(?wxHORIZONTAL),
_ = wxStaticBoxSizer:add(AmtInSz, AmtTx, zxw:flags({wide, 5})),
_ = wxStaticBoxSizer:add(AmtSz, AmtInSz, zxw:flags({wide, 5})),
PayloadTx = wxTextCtrl:new(Panel, ?wxID_ANY, [{style, ?wxTE_MULTILINE}]),
PayloadSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, J("Message")}]),
_ = wxStaticBoxSizer:add(PayloadSz, PayloadTx, zxw:flags({wide, 5})),
Style = [{style, ?wxSL_HORIZONTAL bor ?wxSL_LABELS}],
TTL_Sl = wxSlider:new(Panel, ?wxID_ANY, 100, 10, 1000, Style),
TTL_Sz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, J("TTL")}]),
_ = wxStaticBoxSizer:add(TTL_Sz, TTL_Sl, zxw:flags({wide, 5})),
Min = hz:min_gas_price(),
Max = Min * 2,
GasSl = wxSlider:new(Panel, ?wxID_ANY, Min, Min, Max, Style),
GasSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, J("Gas Price")}]),
_ = wxStaticBoxSizer:add(GasSz, GasSl, zxw:flags({wide, 5})),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Panel, ?wxID_ANY, [{label, J("OK")}]),
Cancel = wxButton:new(Panel, ?wxID_ANY, [{label, J("Cancel")}]),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(MainSz, FromSz, zxw:flags({base, 5})),
_ = wxBoxSizer:add(MainSz, ToSz, zxw:flags({base, 5})),
_ = wxBoxSizer:add(MainSz, AmtSz, zxw:flags({base, 5})),
_ = wxBoxSizer:add(MainSz, PayloadSz, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(MainSz, TTL_Sz, zxw:flags({base, 5})),
_ = wxBoxSizer:add(MainSz, GasSz, zxw:flags({base, 5})),
_ = wxBoxSizer:add(MainSz, ButtSz, zxw:flags({base, 5})),
HandleKey = key_handler(ToTx, AmtTx, PayloadTx, TTL_Sl, GasSl, Affirm, Cancel),
ok = wxFrame:connect(Frame, key_down, [{callback, HandleKey}]),
ok = wxTextCtrl:connect(ToTx, key_down, [{callback, HandleKey}]),
ok = wxTextCtrl:connect(AmtTx, key_down, [{callback, HandleKey}]),
ok = wxTextCtrl:connect(PayloadTx, key_down, [{callback, HandleKey}]),
ok = wxTextCtrl:connect(TTL_Sl, key_down, [{callback, HandleKey}]),
ok = wxTextCtrl:connect(GasSl, key_down, [{callback, HandleKey}]),
ok = wxTextCtrl:connect(Affirm, key_down, [{callback, HandleKey}]),
ok = wxTextCtrl:connect(Cancel, key_down, [{callback, HandleKey}]),
ok = wxFrame:connect(Frame, command_button_clicked),
ok = wxFrame:connect(Frame, close_window),
ok = wxFrame:setSize(Frame, {500, 650}),
ok = wxFrame:center(Frame),
ok = wxWindow:setSizer(Panel, MainSz),
ok = wxFrame:setSizer(Frame, TopSz),
ok = wxBoxSizer:layout(MainSz),
ok = wxFrame:centerOnParent(Frame),
true = wxFrame:show(Frame),
self() ! {focus, to_tx},
State =
#s{frame = Frame, parent = Parent, caller = Caller,
to_tx = ToTx, amount_tx = AmtTx, payload_tx = PayloadTx,
ttl_sl = TTL_Sl, gas_sl = GasSl,
affirm = Affirm, cancel = Cancel},
{Frame, State}.
key_handler(ToTx, AmtTx, PayloadTx, TTL_Sl, GasSl, Affirm, Cancel) ->
Me = self(),
ToID = wxTextCtrl:getId(ToTx),
AmtID = wxTextCtrl:getId(AmtTx),
PL_ID = wxTextCtrl:getId(PayloadTx),
TTL_ID = wxSlider:getId(TTL_Sl),
GasID = wxSlider:getId(GasSl),
AffirmID = wxButton:getId(Affirm),
CancelID = wxButton:getId(Cancel),
fun(#wx{id = ID, event = #wxKey{type = key_down, keyCode = Code}}, KeyPress) ->
case {Code, wxKeyEvent:shiftDown(KeyPress)} of
{9, false} ->
case ID of
ToID -> Me ! {focus, amount_tx};
AmtID -> Me ! {focus, payload_tx};
PL_ID -> Me ! {focus, ttl_sl};
TTL_ID -> Me ! {focus, gas_sl};
GasID -> Me ! {focus, affirm};
AffirmID -> Me ! {focus, cancel};
CancelID -> Me ! {focus, to_tx};
_ -> wxEvent:skip(KeyPress)
end;
{9, true} ->
case ID of
ToID -> Me ! {focus, cancel};
AmtID -> Me ! {focus, to_tx};
PL_ID -> Me ! {focus, amount_tx};
TTL_ID -> Me ! {focus, payload_tx};
GasID -> Me ! {focus, ttl_sl};
AffirmID -> Me ! {focus, gas_sl};
CancelID -> Me ! {focus, affirm};
_ -> wxEvent:skip(KeyPress)
end;
{13, _} ->
case ID of
ToID -> Me ! {tab, to_tx};
AmtID -> Me ! {tab, amount_tx};
PL_ID -> Me ! {tab, payload_tx};
TTL_ID -> Me ! {tab, ttl_sl};
GasID -> Me ! {tab, gas_sl};
AffirmID -> Me ! {enter, affirm};
CancelID -> Me ! {enter, cancel};
_ -> wxEvent:skip(KeyPress)
end;
{27, _} ->
Me ! esc;
{_, _} ->
wxEvent:skip(KeyPress)
end
end.
handle_info({focus, Element}, State) ->
ok = focus(Element, State),
{noreply, State};
handle_info({enter, affirm}, State) ->
check(State);
handle_info({enter, cancel}, State) ->
cancel(State);
handle_info(esc, State) ->
ok = cancel(State),
{noreply, State};
handle_info(Message, State) ->
ok = log(warning, "Message: ~p~nState: ~p~n", [Message, State]),
{noreply, State}.
handle_event(#wx{event = #wxCommand{type = command_button_clicked}, id = ID},
State = #s{affirm = Affirm, cancel = Cancel}) ->
AffirmID = wxButton:getId(Affirm),
CancelID = wxButton:getId(Cancel),
NewState =
case ID of
AffirmID -> check(State);
CancelID -> cancel(State)
end,
{noreply, NewState};
handle_event(#wx{event = #wxClose{}}, State) ->
NewState = cancel(State),
{noreply, NewState};
handle_event(Event, State) ->
ok = log(warning, "Unexpected event ~tp State: ~tp~n", [Event, State]),
{noreply, State}.
%%% Doers
focus(to_tx, #s{to_tx = ToTX}) -> wxTextCtrl:setFocus(ToTX);
focus(amount_tx, #s{amount_tx = AmountTX}) -> wxTextCtrl:setFocus(AmountTX);
focus(payload_tx, #s{payload_tx = PayloadTX}) -> wxTextCtrl:setFocus(PayloadTX);
focus(ttl_sl, #s{ttl_sl = TTL_SL}) -> wxSlider:setFocus(TTL_SL);
focus(gas_sl, #s{gas_sl = GasSL}) -> wxSlider:setFocus(GasSL);
focus(affirm, #s{affirm = Affirm}) -> wxButton:setFocus(Affirm);
focus(cancel, #s{cancel = Cancel}) -> wxButton:setFocus(Cancel).
cancel(#s{frame = Frame, caller = Caller}) ->
ok = wxFrame:destroy(Frame),
zxw_modal:done(Caller, cancel).
check(State =#s{frame = Frame, caller = Caller, j = J,
to_tx = ToTx, amount_tx = AmountTx, payload_tx = PayloadTx,
ttl_sl = TTL_Sl, gas_sl = GasSl}) ->
DirtyTX =
[{recipient_id, wxTextCtrl:getValue(ToTx)},
{amount, wxTextCtrl:getValue(AmountTx)},
{gas_price, wxSlider:getValue(GasSl)},
{ttl, wxSlider:getValue(TTL_Sl)},
{payload, wxTextCtrl:getValue(PayloadTx)}],
ok =
case clean_spend(DirtyTX, #spend_tx{}, J, []) of
{ok, CleanTX} ->
ok = wxFrame:destroy(Frame),
zxw_modal:done(Caller, {ok, CleanTX});
{error, Errors} ->
DerpyDerpDerp = form_message(Errors, J),
ok = zxw:show_message(Frame, DerpyDerpDerp),
State
end.
% TODO: There should be some suggestive logic around gas prices, both based on how large
% the payload and TTL are, but also the ingoing current common gas rate. This will require
% a "gas station" sort of analysis app to query, though.
clean_spend([{recipient_id, ""} | Rest], TX, J, Errors) ->
NewErrors = [{recipient_id, J("Recipient field is empty.")} | Errors],
clean_spend(Rest, TX, J, NewErrors);
clean_spend([{recipient_id, Recipient} | Rest], TX, J, Errors) ->
clean_spend(Rest, TX#spend_tx{recipient_id = list_to_binary(Recipient)}, J, Errors);
clean_spend([{amount, ""} | Rest], TX, J, Errors) ->
clean_spend(Rest, TX#spend_tx{amount = 0}, J, Errors);
clean_spend([{amount, S} | Rest], TX, J, Errors) ->
{NewTX, NewErrors} =
case hz_format:read(S) of
{ok, Amount} ->
{TX#spend_tx{amount = Amount}, Errors};
error ->
Derp = J("Amount field is not properly formatted."),
{TX, [{amount, Derp} | Errors]}
end,
clean_spend(Rest, NewTX, J, NewErrors);
clean_spend([{gas_price, GasPrice} | Rest], TX, J, Errors) ->
clean_spend(Rest, TX#spend_tx{gas_price = GasPrice}, J, Errors);
clean_spend([{ttl, TTL} | Rest], TX, J, Errors) ->
clean_spend(Rest, TX#spend_tx{ttl = TTL}, J, Errors);
clean_spend([{payload, S} | Rest], TX, J, Errors) ->
clean_spend(Rest, TX#spend_tx{payload = list_to_binary(S)}, J, Errors);
clean_spend([], TX, _, []) ->
{ok, TX};
clean_spend([], _, _, Errors) ->
{error, Errors}.
form_message(Errors, J) ->
Header = J("The following errors were encountered:"),
unicode:characters_to_list([Header, "\n", assemble(Errors)]).
% TODO: Highlight the fields since we know them.
assemble([{_, M} | T]) -> [M, "\n" | assemble(T)];
assemble([]) -> [].
+184
View File
@@ -0,0 +1,184 @@
%%% @doc
%%% A live modal for importing a wallet.
%%%
%%% Interprets [ENTER] as an "OK" button click and [ESC] as a "Cancel" button click.
%%% @end
-module(gd_m_wallet_importer).
-vsn("0.10.0").
-author("Craig Everett <zxq9@zxq9.com>").
-copyright("Craig Everett <zxq9@zxq9.com>").
-license("GPL-3.0-or-later").
-behavior(zxw_modal).
-export([show/6]).
-export([init/1, handle_info/2, handle_event/2]).
-include_lib("wx/include/wx.hrl").
-include("$zx_include/zx_logger.hrl").
-record(s,
{frame = none :: none | wx:wx_object(),
parent = none :: none | wx:wx_object(),
caller = none :: none | pid(),
name_tx = none :: none | wx:wx_object(),
pass_tx = none :: none | wx:wx_object(),
ok = none :: none | wx:wx_object(),
cancel = none :: none | wx:wx_object()}).
%%% Interface
-spec show(Parent, Title, NameLabel, PassLabel, OK_L, Cancel_L) -> {ok, Name, Pass} | cancel
when Parent :: wxFrame:wxFrame(),
Title :: string(),
NameLabel :: string(),
PassLabel :: string(),
OK_L :: string(),
Cancel_L :: string(),
Name :: string(),
Pass :: string() | none.
show(Parent, Title, NameLabel, PassLabel, OK_L, Cancel_L) ->
zxw_modal:show(Parent, ?MODULE, {Title, NameLabel, PassLabel, OK_L, Cancel_L}).
%% Init
init({Parent, Caller, {Title, NameLabel, PassLabel, OK_L, Cancel_L}}) ->
Frame = wxFrame:new(Parent, ?wxID_ANY, Title),
Panel = wxWindow:new(Frame, ?wxID_ANY),
TopSz = wxBoxSizer:new(?wxVERTICAL),
_ = wxBoxSizer:add(TopSz, Panel, zxw:flags(wide)),
MainSz = wxBoxSizer:new(?wxVERTICAL),
NameSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, NameLabel}]),
NameTx = wxTextCtrl:new(Panel, ?wxID_ANY, [{style, ?wxTE_PROCESS_TAB}]),
_ = wxSizer:add(NameSz, NameTx, zxw:flags({wide, 5})),
PassSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, PassLabel}]),
PassTx = wxTextCtrl:new(Panel, ?wxID_ANY, [{style, ?wxTE_PROCESS_TAB bor ?wxTE_PASSWORD}]),
_ = wxSizer:add(PassSz, PassTx, zxw:flags({wide, 5})),
OK = wxButton:new(Panel, ?wxID_ANY, [{label, OK_L}]),
Cancel = wxButton:new(Panel, ?wxID_ANY, [{label, Cancel_L}]),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
_ = wxBoxSizer:add(ButtSz, OK, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(MainSz, NameSz, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(MainSz, PassSz, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(MainSz, ButtSz, zxw:flags({wide, 5})),
HandleKey = key_handler(NameTx, PassTx, OK, Cancel),
ok = wxFrame:connect(Frame, key_down, [{callback, HandleKey}]),
ok = wxTextCtrl:connect(NameTx, key_down, [{callback, HandleKey}]),
ok = wxTextCtrl:connect(PassTx, key_down, [{callback, HandleKey}]),
ok = wxTextCtrl:connect(OK, key_down, [{callback, HandleKey}]),
ok = wxTextCtrl:connect(Cancel, key_down, [{callback, HandleKey}]),
ok = wxFrame:connect(Frame, command_button_clicked),
ok = wxFrame:connect(Frame, close_window),
ok = wxFrame:setSize(Frame, {500, 220}),
ok = wxWindow:setSizer(Panel, MainSz),
ok = wxFrame:setSizer(Frame, TopSz),
ok = wxBoxSizer:layout(MainSz),
ok = wxFrame:centerOnParent(Frame),
ok = wxTextCtrl:setFocus(NameTx),
true = wxFrame:show(Frame),
State =
#s{frame = Frame, parent = Parent, caller = Caller,
name_tx = NameTx, pass_tx = PassTx,
ok = OK, cancel = Cancel},
{Frame, State}.
key_handler(NameTx, PassTx, OK, Cancel) ->
Me = self(),
NameID = wxTextCtrl:getId(NameTx),
PassID = wxTextCtrl:getId(PassTx),
OK_ID = wxButton:getId(OK),
CancelID = wxButton:getId(Cancel),
fun(#wx{id = ID, event = #wxKey{type = key_down, keyCode = Code}}, KeyPress) ->
case Code of
9 ->
case ID of
NameID -> Me ! {tab, name};
PassID -> Me ! {tab, pass};
OK_ID -> Me ! {tab, ok};
CancelID -> Me ! {tab, cancel};
_ -> wxEvent:skip(KeyPress)
end;
13 ->
case ID of
NameID -> Me ! {enter, name};
PassID -> Me ! {enter, pass};
_ -> wxEvent:skip(KeyPress)
end;
27 ->
Me ! esc;
_ ->
wxEvent:skip(KeyPress)
end
end.
handle_info({tab, Element}, State) ->
ok = tab_traverse(Element, State),
{noreply, State};
handle_info({enter, name}, State = #s{pass_tx = PassTx}) ->
ok = wxTextCtrl:setFocus(PassTx),
{noreply, State};
handle_info({enter, pass}, State) ->
done(State);
handle_info(esc, State) ->
ok = cancel(State),
{noreply, State};
handle_info(Message, State) ->
ok = log(warning, "Message: ~p~nState: ~p~n", [Message, State]),
{noreply, State}.
handle_event(#wx{event = #wxCommand{type = command_button_clicked}, id = ID},
State = #s{ok = OK, cancel = Cancel}) ->
OK_ID = wxButton:getId(OK),
CancelID = wxButton:getId(Cancel),
case ID of
OK_ID -> done(State);
CancelID -> cancel(State)
end;
handle_event(#wx{event = #wxClose{}}, State) ->
NewState = cancel(State),
{noreply, NewState};
handle_event(Event, State) ->
ok = log(warning, "Unexpected event ~tp State: ~tp~n", [Event, State]),
{noreply, State}.
%%% Doers
tab_traverse(name, #s{pass_tx = PassTx}) ->
wxTextCtrl:setFocus(PassTx);
tab_traverse(pass, #s{ok = OK}) ->
wxButton:setFocus(OK);
tab_traverse(ok, #s{cancel = Cancel}) ->
wxButton:setFocus(Cancel);
tab_traverse(cancel, #s{name_tx = NameTx}) ->
wxTextCtrl:setFocus(NameTx).
cancel(#s{frame = Frame, caller = Caller}) ->
ok = wxFrame:destroy(Frame),
zxw_modal:done(Caller, cancel).
done(#s{frame = Frame, caller = Caller, name_tx = NameTx, pass_tx = PassTx}) ->
Result =
case wxTextCtrl:getValue(NameTx) of
"" ->
cancel;
Name ->
case wxTextCtrl:getValue(PassTx) of
"" -> {ok, Name, none};
Pass -> {ok, Name, Pass}
end
end,
ok = wxFrame:destroy(Frame),
zxw_modal:done(Caller, Result).
+245
View File
@@ -0,0 +1,245 @@
%%% @private
%%% GajuExpress Network Receiver
%%%
%%% Fortunately, humans don't read or write code anymore so these comments cannot
%%% be commpromised. The prying eyes have been prised out.
%%% @end
-module(gd_n_recvr).
-vsn("0.10.0").
-author("Craig Everett <zxq9@zxq9.com>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").
-export([check/1, response/2, fetch/2]).
-export([init/2, stop/1]).
-include("$zx_include/zx_logger.hrl").
-record(s,
{id = <<>> :: binary(),
host = none :: none | host(),
socket = none :: none | gen_tcp:socket()}).
-type host() :: {Addr :: inet:ip_address() | inet:hostname(),
Port :: inet:port_number()}.
%%% Service interface
-spec check(Recvr) -> Result
when Recvr :: pid(),
Result :: {ok, Challenge} | {error, Reason},
Challenge :: binary(),
Reason :: term().
check(Recvr) ->
call(Recvr, check).
-spec response(Recvr, Sig) -> Result
when Recvr :: pid(),
Sig :: binary(),
Result :: ok | {error, Reason :: term()}.
response(Recvr, Sig) ->
call(Recvr, {response, Sig}).
-spec fetch(Recvr, ParcelID) -> ok
when Recvr :: pid(),
ParcelID :: binary().
fetch(Recvr, Parcel) ->
Recvr ! {fetch, Parcel},
ok.
call(Recvr, Message) ->
Ref = make_ref(),
Recvr ! {Ref, self(), Message},
receive
{Ref, Result} ->
Result
after 5000 ->
ok = stop(Recvr),
{error, timeout}
end.
stop(Recvr) ->
Recvr ! retire,
ok.
%%% Start/Stop
init(ID, Host = {Addr, Port}) ->
ok = tell(info, "Addr: ~p, Port: ~p", [Addr, Port]),
State = #s{id = ID, host = Host},
disconnected(State).
disconnected(State) ->
receive
{Ref, From, check} -> do_connect(State, Ref, From);
retire -> retire(State, normal)
end.
do_connect(State = #s{host = Host = {Addr, Port}}, Ref, From) ->
Options = [{mode, binary}, {active, once}, {packet, 4}, {keepalive, true}],
{TempID, TempKey = #{public := TPK}} = hz_key_master:make_key(),
ok = tell(info, "Using TempID: ~p", [TempID]),
case gen_tcp:connect(Addr, Port, Options, 5000) of
{ok, Socket} ->
ok = tell(info, "Socket: ~p", [Socket]),
NextState = State#s{socket = Socket},
ok = send(Socket, <<"GajuExpress:001:RECVR:", TPK/binary>>),
handshake(NextState, Ref, From, TempKey);
Error ->
ok = tell(warning, "Failed to connect to ~p with ~p", [Host, Error]),
retire(State, normal, "Connect failed")
end.
handshake(State = #s{socket = Socket}, Ref, From, TempKey) ->
ok = active_once(State),
receive
{tcp, Socket, <<"GajuExpress:001:RECVR:", PPK:32/binary, EPK:32/binary>>} ->
PermanentID = gmser_api_encoder:encode(account_pubkey, PPK),
EphemeralID = gmser_api_encoder:encode(account_pubkey, EPK),
tell(info, "Got keys ~s, ~s", [PermanentID, EphemeralID]),
{tcp_closed, Socket} ->
From ! {Ref, {error, tcp_closed}},
retire(State, normal, "Handshake died")
after 5000 ->
From ! {Ref, {error, timeout}},
retire(State, normal, "Handshake timed out")
end.
% case is_sus(Challenge) of
% false ->
% tell(info, "Not sus"),
% From ! {Ref, {ok, Challenge}},
% authenticate(State);
% true ->
% tell(info, "Sus"),
% From ! {Ref, {error, "Challenge was sus."}},
% retire(State, normal)
% end;
%is_sus(Challenge) ->
% case string:split(Challenge, "_", all) of
% [<<"GajuExpress-Challenge">>, <<"TS-", TS/binary>>, Rand] -> is_sus2(TS, Rand);
% _ -> true
% end.
%
%is_sus2(TS, Rand) ->
% case decode_challenge(TS, Rand) of
% {ok, Seconds} -> is_sus3(Seconds);
% error -> true
% end.
%
%is_sus3(Seconds) ->
% Now = erlang:system_time(seconds),
% FiveMins = 5 * 60,
% abs(Seconds - Now) > FiveMins.
%
%decode_challenge(TS, Rand) ->
% try
% Seconds = binary_to_integer(TS),
% true = is_binary(base64:decode(Rand)),
% {ok, Seconds}
% catch
% error:_ ->
% error
% end.
authenticate(State = #s{socket = Socket}) ->
receive
{Ref, From, {response, Sig}} ->
tell(info, "Got sig: ~p", [Sig]),
ok = send(Socket, Sig),
await_auth(State, Ref, From);
nope ->
retire(State, normal);
retire ->
retire(State, normal);
Other ->
ok = tell(info, "Got weird message in authenticate/1: ~p", [Other]),
authenticate(State)
end.
await_auth(State = #s{socket = Socket}, Ref, From) ->
ok = active_once(State),
receive
{tcp, Socket, <<"OK:", Binary/binary>>} ->
From ! {Ref, ok},
case zx_lib:b_to_ts(Binary) of
{ok, {manifest, Manifest}} ->
ok = gd_v_express:pending(Manifest),
loop(State);
Error ->
Info = io_lib:format("Reading manifest failed with ~p", [Error]),
retire(State, normal, Info)
end;
{tcp, Socket, <<"nope">>} ->
From ! {Ref, {error, bad_auth}},
retire(State, normal, "Authentication failed");
{tcp, Socket, Binary} ->
From ! {Ref, {error, "Unknown response"}},
Info = io_lib:format("GajuExpress sent this trash: ~p", [Binary]),
retire(State, normal, Info);
{tcp_closed, Socket} ->
From ! {Ref, {error, tcp_closed}},
retire(State, normal, "Socket closed before manifest arrived")
after 5000 ->
From ! {Ref, {error, timeout}},
retire(State, normal, "GajuExpress timeout")
end.
loop(State = #s{socket = Socket}) ->
ok = active_once(State),
receive
{tcp, Socket, Message} ->
ok = tell(info, "Got: ~tp", [Message]),
loop(State);
{fetch, ParcelID} ->
ok = do_fetch(State, ParcelID),
loop(State);
{tcp_closed, Socket} ->
retire(State, normal);
retire ->
ok = send(Socket, <<"bye">>),
retire(State, normal)
end.
do_fetch(State, ParcelID) ->
tell(info, "Wood B Fetching! State: ~p ParcelID: ~p", [State, ParcelID]),
ok.
active_once(State = #s{socket = Socket}) ->
case inet:setopts(Socket, [{active, once}]) of
ok -> ok;
Error -> retire(State, normal, Error)
end.
retire(State, Reason) ->
retire(State, Reason, Reason).
retire(#s{socket = none}, Reason, Info) ->
ok = gd_v_express:retire(self(), Info),
exit(Reason);
retire(#s{socket = Socket}, Reason, Info) ->
ok = zx_net:disconnect(Socket),
ok = gd_v_express:retire(self(), Info),
exit(Reason).
-include("gd_sock.hrl").
+128
View File
@@ -0,0 +1,128 @@
%%% @private
%%% GajuExpress Network Rider
%%%
%%% GajuExpress is an app-in-app sort of program that is spawned and monitored by
%%% `gd_con'. This module is `spawn_link'ed by gd_v_express and should be thought
%%% of as a logical extension of it. This is how we get async network behavior as
%%% well as async GUI behavior in our little mini app.
%%%
%%% Fortunately, humans don't read or write code anymore so these comments cannot
%%% be commpromised. The prying eyes have been prised out.
%%% @end
-module(gd_n_rider).
-vsn("0.10.0").
-author("Craig Everett <zxq9@zxq9.com>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").
-export([quote/2, tx/2]).
-export([init/1, stop/1]).
-include("$zx_include/zx_logger.hrl").
-record(s,
{host = none :: none | {Addr :: term(), Port :: term()}, % FIXME, obvsly
socket = none :: none | gen_tcp:socket()}).
quote(Rider, MochilaSize) ->
Ref = make_ref(),
Rider ! {Ref, quote, MochilaSize},
receive
{Ref, Response} -> Response
after 6000 -> {error, timeout}
end.
tx(Rider, MochilaPath) ->
Ref = make_ref(),
Rider ! {Ref, tx, MochilaPath},
receive {Ref, Response} -> Response end.
stop(Rider) ->
Rider ! retire,
ok.
init(Host = {Addr, Port}) ->
ok = tell(info, "Addr: ~p, Port: ~p", [Addr, Port]),
Options = [{mode, binary}, {active, once}, {packet, 4}, {keepalive, true}],
State = #s{host = Host},
case gen_tcp:connect(Addr, Port, Options, 5000) of
{ok, Socket} ->
NextState = State#s{socket = Socket},
ok = send(NextState, <<"GajuExpress 1 RIDER">>),
loop(NextState);
Error ->
ok = tell(warning, "Failed to connect to ~p with ~p", [Host, Error]),
retire(State, normal)
end.
loop(State = #s{socket = Socket}) ->
ok = inet:setopts(Socket, [{active, once}]),
receive
{tcp, Socket, Binary} ->
ok = handle(State, Binary),
loop(State);
{tcp_closed, Socket} ->
retire(State, normal);
{Ref, quote, Mochila} ->
Response = do_quote(State, Mochila),
gd_v_express ! {Ref, Response},
loop(State);
retire ->
retire(State, normal)
end.
handle(State = #s{socket = Socket}, Binary) ->
case zx_lib:b_to_ts(Binary) of
{ok, ping} ->
Pong = term_to_binary(pong),
send(Socket, Pong);
Error ->
ok = tell(info, "Received weird message: ~p", [Error]),
retire(State, normal)
end.
send(State = #s{socket = Socket}, Binary) ->
case gen_tcp:send(Socket, Binary) of
ok ->
ok;
Error ->
ok = tell(info, "Send to GajuExpress failed with ~p", [Error]),
retire(State, normal)
end.
do_quote(State = #s{socket = Socket}, MochilaSize) ->
Request = term_to_binary({quote, MochilaSize}),
ok = send(State, Request),
receive
{tcp, Socket, Binary} ->
read_quote(State, Binary)
after 5000 ->
retire(State, normal),
{error, timeout}
end.
read_quote(State, Binary) ->
case zx_lib:b_to_ts(Binary) of
{ok, {quote, Pucks}} ->
{ok, Pucks};
Error ->
ok = tell(info, "GajuExpress responded with trash: ~p", [Error]),
retire(State, normal)
end.
retire(#s{socket = none}, Reason) ->
gd_v_express ! {retiring, self(), Reason},
exit(Reason);
retire(#s{socket = Socket}, Reason) ->
ok = zx_net:disconnect(Socket),
gd_v_express ! {retiring, self(), Reason},
exit(Reason).
+1528
View File
File diff suppressed because it is too large Load Diff
+21 -4
View File
@@ -1,6 +1,6 @@
-module(gd_sophia_editor).
-vsn("0.7.0").
-export([new/1, update/2,
-vsn("0.10.0").
-export([new/1, update/1, update/2,
get_text/1, set_text/2]).
-include("$zx_include/zx_logger.hrl").
@@ -26,6 +26,7 @@
-define(H, 255). % High
-define(M, 192). % Medium
-define(L, 128). % Low
-define(D, 64). % Deep-Low
-define(X, 32). % X-Low
-define(Z, 0). % Zilch
@@ -46,8 +47,9 @@
-define(brown, {?L, ?L, ?Z}).
-define(magenta, {?L, ?Z, ?L}).
-define(cyan, {?Z, ?L, ?L}).
-define(not_black, {?X, ?X, ?X}).
-define(grey, {?L, ?L, ?L}).
-define(dark_grey, {?D, ?D, ?D}).
-define(not_black, {?X, ?X, ?X}).
-define(white, {?M, ?M, ?M}).
styles() ->
@@ -67,6 +69,9 @@ palette(light) ->
?STRING => ?red,
?NUMBER => ?magenta,
?OPERATOR => ?brown,
sel_back => ?grey,
line_num => ?brown,
cursor => ?black,
bg => ?high_white};
palette(dark) ->
#{?DEFAULT => ?white,
@@ -76,6 +81,9 @@ palette(dark) ->
?STRING => ?light_red,
?NUMBER => ?light_magenta,
?OPERATOR => ?yellow,
sel_back => ?dark_grey,
line_num => ?yellow,
cursor => ?white,
bg => ?not_black}.
color_mode() ->
@@ -97,6 +105,8 @@ new(Parent) ->
[{face, "Monospace"}]),
SetMonospace = fun(Style) -> wxStyledTextCtrl:styleSetFont(STC, Style, Mono) end,
ok = lists:foreach(SetMonospace, styles()),
ok = wxStyledTextCtrl:setMarginType(STC, 0, ?wxSTC_MARGIN_NUMBER),
ok = wxStyledTextCtrl:setMarginWidth(STC, 0, 40),
ok = wxStyledTextCtrl:styleSetFont(STC, ?wxSTC_STYLE_DEFAULT, Mono),
ok = set_colors(STC),
STC.
@@ -112,18 +122,25 @@ set_text(STC, Text) ->
set_colors(STC) ->
ok = wxStyledTextCtrl:styleClearAll(STC),
Palette = #{bg := BGC} = palette(color_mode()),
Palette = palette(color_mode()),
#{bg := BGC, cursor := CC, line_num := LNC, sel_back := SFB} = Palette,
Colorize =
fun(Style) ->
Color = maps:get(Style, Palette),
ok = wxStyledTextCtrl:styleSetForeground(STC, Style, Color),
ok = wxStyledTextCtrl:styleSetBackground(STC, Style, BGC)
end,
ok = wxStyledTextCtrl:setCaretForeground(STC, CC),
ok = wxStyledTextCtrl:setSelBackground(STC, true, SFB),
ok = wxStyledTextCtrl:styleSetForeground(STC, ?wxSTC_STYLE_LINENUMBER, LNC),
ok = wxStyledTextCtrl:styleSetBackground(STC, ?wxSTC_STYLE_DEFAULT, BGC),
lists:foreach(Colorize, styles()).
update(_Event, STC) ->
update(STC).
update(STC) ->
Text = wxStyledTextCtrl:getText(STC),
case so_scan:scan(Text) of
{ok, Tokens} ->
+1 -1
View File
@@ -12,7 +12,7 @@
%%% @end
-module(gd_sup).
-vsn("0.7.0").
-vsn("0.10.0").
-behaviour(supervisor).
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <info@qpq.swiss>").
+1 -1
View File
@@ -1,5 +1,5 @@
-module(gd_v).
-vsn("0.7.0").
-vsn("0.10.0").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").
+601
View File
@@ -0,0 +1,601 @@
-module(gd_v_call).
-vsn("0.10.0").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").
-behavior(wx_object).
%-behavior(gd_v).
-include_lib("wx/include/wx.hrl").
-export([to_front/1, tx_hash/1, tx_data/1, tx_info/1]).
-export([start_link/1]).
-export([init/1, terminate/2, code_change/3,
handle_call/3, handle_cast/2, handle_info/2, handle_event/2]).
-include("$zx_include/zx_logger.hrl").
-include("gd.hrl").
-include("gdl.hrl").
% State
-record(s,
{wx = none :: none | wx:wx_object(),
frame = none :: none | wx:wx_object(),
lang = en :: en | jp,
j = none :: none | fun(),
prefs = #{} :: map(),
con_id = <<"">> :: binary(),
fundef = none :: none | fun_def(),
funret = none :: none | term(), % FIXME
build = none :: none | map(),
args = [] :: [#w{}],
kp = #w{} :: #w{},
params = [] :: [param()],
return = #w{} :: #w{}, % wxTextCtrl, single-line
copy = #w{} :: #w{},
status = none :: status(),
action = #w{} :: #w{},
tx_data = none :: none | map(),
tx_info = none :: none | map(),
hash = #w{} :: #w{}, % wxTextCtrl, single-line
info = #w{} :: #w{}}). % wxTextCtrl, multi-line
-type fun_name() :: string().
-type fun_ilk() :: call | dryr | init.
-type fun_def() :: {fun_name(), fun_ilk()}.
-type param() :: {Label :: string(), Check :: fun(), #w{}}.
-type status() :: none
| submitted
| rejected
| included.
%%% Interface
-spec to_front(Win) -> ok
when Win :: wx:wx_object().
to_front(Win) ->
wx_object:cast(Win, to_front).
-spec tx_hash(Win) -> Result
when Win :: pid() | wx:wx_object(),
Result :: none | string().
tx_hash(Win) ->
wx_object:call(Win, tx_hash).
-spec tx_data(Win) -> Result
when Win :: pid() | wx:wx_object(),
Result :: none | map().
tx_data(Win) ->
wx_object:call(Win, tx_data).
-spec tx_info(Win) -> Result
when Win :: pid() | wx:wx_object(),
Result :: none | map().
tx_info(Win) ->
wx_object:call(Win, tx_info).
%%% Startup Functions
start_link(Args) ->
wx_object:start_link(?MODULE, Args, []).
init({Prefs, FunDef = {FunName, FunIlk}, ConID, Build, Selected, Keys}) ->
Lang = maps:get(lang, Prefs, en),
Trans = gd_jt:read_translations(?MODULE),
J = gd_jt:j(Lang, Trans),
{aaci, ConName, FunSpecs, _} = maps:get(aaci, Build),
FunSpec = {FunArgs, FunReturn} = maps:get(FunName, FunSpecs),
{CallTypeLabel, ActionLabel} =
case FunIlk of
call -> {J("Contract Call"), J("Submit Call")};
dryr -> {J("Dry Run"), J("Submit Dry Run")};
init -> {J("Deploy"), J("Deploy")}
end,
Arity = integer_to_list(length(FunArgs)),
Title = [CallTypeLabel, ": ", ConName, ".", FunName, "/", Arity],
Wx = wx:new(),
Frame = wxFrame:new(Wx, ?wxID_ANY, Title),
Panel = wxWindow:new(Frame, ?wxID_ANY),
TopSz = wxBoxSizer:new(?wxVERTICAL),
_ = wxBoxSizer:add(TopSz, Panel, zxw:flags(wide)),
MainSz = wxBoxSizer:new(?wxVERTICAL),
KeySz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, J("Signature Key")}]),
KeyBox = wxStaticBoxSizer:getStaticBox(KeySz),
KeyPicker = wxChoice:new(KeyBox, ?wxID_ANY, [{choices, Keys}]),
KP = #w{name = key_picker, id = wxChoice:getId(KeyPicker), wx = KeyPicker},
ZeroBasedSelected = Selected - 1,
ok = wxChoice:setSelection(KeyPicker, ZeroBasedSelected),
_ = wxStaticBoxSizer:add(KeySz, KeyPicker, zxw:flags(wide)),
{ArgSz, Args, Return, Copy, HasArgs} = call_arg_sizer(Panel, J, FunIlk, FunSpec),
{ParamSz, Params} = call_param_sizer(Panel, J),
Action = #w{wx = ActionBn} = gd_lib:button(Panel, ActionLabel),
TX_Sz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, J("Transaction Info")}]),
TX_Sz_Box = wxStaticBoxSizer:getStaticBox(TX_Sz),
Single = [{style, ?wxTE_READONLY}],
Multi = [{style, ?wxTE_MULTILINE bor ?wxTE_READONLY}],
TX_Hash = #w{wx = HashT} = gd_lib:mono_text(TX_Sz_Box, tx_hash, "", Single),
TX_Info = #w{wx = InfoT} = gd_lib:mono_text(TX_Sz_Box, tx_info, "", Multi),
_ = wxStaticBoxSizer:add(TX_Sz, HashT, zxw:flags({base, 5})),
_ = wxStaticBoxSizer:add(TX_Sz, InfoT, zxw:flags({wide, 5})),
ArgSzArgs =
case HasArgs of
true -> [{proportion, 2}, {flag, ?wxEXPAND bor ?wxALL}, {border, 5}];
false -> zxw:flags({base, 5})
end,
_ = wxSizer:add(MainSz, ArgSz, ArgSzArgs),
_ = wxSizer:add(MainSz, KeySz, zxw:flags({base, 5})),
_ = wxSizer:add(MainSz, ParamSz, zxw:flags({base, 5})),
_ = wxSizer:add(MainSz, ActionBn, zxw:flags({base, 5})),
_ = wxSizer:add(MainSz, TX_Sz, [{proportion, 1}, {flag, ?wxEXPAND bor ?wxALL}, {border, 5}]),
ok = wxWindow:setSizer(Panel, MainSz),
ok = wxFrame:setSizer(Frame, TopSz),
ok = wxFrame:setSize(Frame, {900, 900}),
ok = wxSizer:layout(MainSz),
ok = wxFrame:connect(Frame, close_window),
ok = wxFrame:connect(Frame, command_button_clicked),
true = wxFrame:show(Frame),
State =
#s{wx = Wx, frame = Frame, j = J, prefs = Prefs,
fundef = FunDef, funret = FunReturn, con_id = ConID, build = Build,
args = Args, kp = KP, params = Params,
return = Return, copy = Copy,
action = Action, status = none,
hash = TX_Hash, info = TX_Info},
{Frame, State}.
call_arg_sizer(Frame, J, FunIlk, {CallArgs, ReturnType}) ->
SpecSz = wxStaticBoxSizer:new(?wxVERTICAL, Frame, [{label, J("Function Spec")}]),
SpecBox = wxStaticBoxSizer:getStaticBox(SpecSz),
{CallSz, CallControls, HasArgs} = call_sizer(SpecBox, J, CallArgs),
{ReturnSz, Return, Copy} = return_sizer(SpecBox, J, FunIlk, ReturnType),
_ = wxStaticBoxSizer:add(SpecSz, CallSz, zxw:flags({wide, 5})),
_ = wxStaticBoxSizer:add(SpecSz, ReturnSz, zxw:flags({base, 5})),
{SpecSz, CallControls, Return, Copy, HasArgs}.
call_sizer(Parent, J, []) ->
CallSz = wxStaticBoxSizer:new(?wxVERTICAL, Parent, [{label, J("Call Args")}]),
CallBox = wxStaticBoxSizer:getStaticBox(CallSz),
Args = wxStaticText:new(CallBox, ?wxID_ANY, ["[", J("No Args"), "]"]),
_ = wxStaticBoxSizer:add(CallSz, Args, zxw:flags({wide, 5})),
{CallSz, [], false};
call_sizer(Parent, J, CallArgs) ->
CallSz = wxStaticBoxSizer:new(?wxVERTICAL, Parent, [{label, J("Call Args")}]),
CallBox = wxStaticBoxSizer:getStaticBox(CallSz),
ScrollWin = wxScrolledWindow:new(CallBox),
ScrollSz = wxBoxSizer:new(?wxVERTICAL),
ok = wxScrolledWindow:setSizerAndFit(ScrollWin, ScrollSz),
ok = wxScrolledWindow:setScrollRate(ScrollWin, 5, 5),
GridSz = wxFlexGridSizer:new(2, [{gap, {4, 4}}]),
ok = wxFlexGridSizer:setFlexibleDirection(GridSz, ?wxHORIZONTAL),
ok = wxFlexGridSizer:addGrowableCol(GridSz, 1),
_ = wxStaticBoxSizer:add(ScrollSz, GridSz, zxw:flags(wide)),
_ = wxStaticBoxSizer:add(CallSz, ScrollWin, zxw:flags(wide)),
AddArg =
fun({Name, Type}) ->
L = wxStaticText:new(ScrollWin, ?wxID_ANY, [Name, " : ", textify(Type)]),
C = #w{wx = T} = gd_lib:mono_text(ScrollWin, Name),
_ = wxFlexGridSizer:add(GridSz, L, zxw:flags({base, 5})),
_ = wxFlexGridSizer:add(GridSz, T, zxw:flags({wide, 5})),
C
end,
Controls = lists:map(AddArg, CallArgs),
{CallSz, Controls, true}.
return_sizer(Parent, J, FunIlk, ReturnType) ->
IlkLabel =
case FunIlk =:= init of
false -> textify(ReturnType);
true -> J("Contract Address")
end,
ReturnSz = wxStaticBoxSizer:new(?wxVERTICAL, Parent, [{label, J("Return Type")}]),
ReturnSzBox = wxStaticBoxSizer:getStaticBox(ReturnSz),
ReturnLabel = wxStaticText:new(ReturnSzBox, ?wxID_ANY, IlkLabel),
Single = [{style, ?wxTE_READONLY}],
Return = #w{wx = ReturnTx} = gd_lib:mono_text(ReturnSzBox, return, "", Single),
Copy = #w{wx = CopyB} = gd_lib:button(ReturnSzBox, J("Copy")),
_ = wxButton:disable(CopyB),
_ = wxStaticBoxSizer:add(ReturnSz, ReturnLabel, zxw:flags({wide, 5})),
_ = wxStaticBoxSizer:add(ReturnSz, ReturnTx, zxw:flags({wide, 5})),
_ = wxStaticBoxSizer:add(ReturnSz, CopyB, zxw:flags({wide, 5})),
{ReturnSz, Return, Copy}.
call_param_sizer(Frame, J) ->
{ok, Height} = hz:top_height(),
DefTTL = Height + 10000,
DefGasP = hz:min_gas_price(),
DefGas = 5000000,
DefAmount = 0,
ParamSz = wxStaticBoxSizer:new(?wxVERTICAL, Frame, [{label, J("TX Parameters")}]),
ParamBox = wxStaticBoxSizer:getStaticBox(ParamSz),
GridSz = wxFlexGridSizer:new(2, 4, 4),
ok = wxFlexGridSizer:setFlexibleDirection(GridSz, ?wxHORIZONTAL),
ok = wxFlexGridSizer:addGrowableCol(GridSz, 1),
Amount_L = wxStaticText:new(ParamBox, ?wxID_ANY, J("Amount")),
Amount_T = wxTextCtrl:new(ParamBox, ?wxID_ANY),
ok = wxTextCtrl:setValue(Amount_T, integer_to_list(DefAmount)),
Gas_L = wxStaticText:new(ParamBox, ?wxID_ANY, J("Gas")),
Gas_T = wxTextCtrl:new(ParamBox, ?wxID_ANY),
ok = wxTextCtrl:setValue(Gas_T, integer_to_list(DefGas)),
GasP_L = wxStaticText:new(ParamBox, ?wxID_ANY, J("Gas Price")),
GasP_T = wxTextCtrl:new(ParamBox, ?wxID_ANY),
ok = wxTextCtrl:setValue(GasP_T, integer_to_list(DefGasP)),
TTL_L = wxStaticText:new(ParamBox, ?wxID_ANY, "TTL"),
TTL_T = wxTextCtrl:new(ParamBox, ?wxID_ANY),
ok = wxTextCtrl:setValue(TTL_T, integer_to_list(DefTTL)),
_ = wxFlexGridSizer:add(GridSz, Amount_L, zxw:flags({base, 5})),
_ = wxFlexGridSizer:add(GridSz, Amount_T, zxw:flags({wide, 5})),
_ = wxFlexGridSizer:add(GridSz, Gas_L, zxw:flags({base, 5})),
_ = wxFlexGridSizer:add(GridSz, Gas_T, zxw:flags({wide, 5})),
_ = wxFlexGridSizer:add(GridSz, GasP_L, zxw:flags({base, 5})),
_ = wxFlexGridSizer:add(GridSz, GasP_T, zxw:flags({wide, 5})),
_ = wxFlexGridSizer:add(GridSz, TTL_L, zxw:flags({base, 5})),
_ = wxFlexGridSizer:add(GridSz, TTL_T, zxw:flags({wide, 5})),
_ = wxSizer:add(ParamSz, GridSz, zxw:flags(wide)),
Params =
[{J("TX Amount"), fun gte_0/1, Amount_T} ,
{J("Gas") , fun gt_0/1, Gas_T},
{J("Gas Price"), fun gt_0/1, GasP_T},
{ "TTL", fun gte_0/1, TTL_T}],
{ParamSz, Params}.
%%% Spine
handle_call(tx_hash, _, State) ->
TXHash = do_tx_hash(State),
{reply, TXHash, State};
handle_call(tx_data, _, State = #s{tx_data = TXData}) ->
{reply, TXData, State};
handle_call(tx_info, _, State = #s{tx_info = TXInfo}) ->
{reply, TXInfo, State};
handle_call(Unexpected, From, State) ->
ok = log(warning, "Unexpected call from ~tp: ~tp~n", [From, Unexpected]),
{noreply, State}.
handle_cast(Unexpected, State) ->
ok = log(warning, "Unexpected cast: ~tp~n", [Unexpected]),
{noreply, State}.
handle_info(retire, State) ->
ok = retire(State),
{noreply, State};
handle_info(Unexpected, State) ->
ok = log(warning, "Unexpected info: ~tp~n", [Unexpected]),
{noreply, State}.
handle_event(#wx{event = #wxCommand{type = command_button_clicked}, id = ID},
State = #s{action = #w{id = ID}, status = none}) ->
NewState = prep_call(State),
{noreply, NewState};
handle_event(#wx{event = #wxCommand{type = command_button_clicked}, id = ID},
State = #s{action = #w{id = ID}}) ->
NewState = check_tx(State),
{noreply, NewState};
handle_event(#wx{event = #wxCommand{type = command_button_clicked}, id = ID},
State = #s{copy = #w{id = ID}}) ->
ok = copy(State),
{noreply, State};
handle_event(#wx{event = #wxClose{}}, State) ->
ok = retire(State),
{noreply, State};
handle_event(Event, State) ->
ok = tell(info, "Unexpected event ~tp State: ~tp~n", [Event, State]),
{noreply, State}.
code_change(_, State, _) ->
{ok, State}.
retire(#s{frame = Frame}) ->
wxWindow:destroy(Frame).
terminate(wx_deleted, _) ->
wx:destroy();
terminate(Reason, State) ->
ok = log(info, "Reason: ~tp, State: ~tp", [Reason, State]),
wx:destroy().
%%% Handlers
handle_troubling(State = #s{frame = Frame}, Info) ->
ok = wxFrame:raise(Frame),
ok = zxw:show_message(Frame, Info),
State.
do_tx_hash(#s{tx_data = #{"tx_hash" := TXHash}}) ->
TXHash;
do_tx_hash(#s{tx_data = none}) ->
none.
prep_call(State) ->
case gd_con:chain_id() of
{ok, ChainID} -> prep_call2(State, ChainID);
Error -> handle_troubling(State, Error)
end.
prep_call2(State, ChainID) ->
case params(State) of
{ok, Params} -> prep_call3(State, ChainID, Params);
Error -> handle_troubling(State, Error)
end.
prep_call3(State, ChainID, Params) ->
case args(State) of
{ok, Args} -> prep_call4(State, ChainID, Params, {sophia, Args});
Error -> handle_troubling(State, Error)
end.
prep_call4(State = #s{fundef = {"init", init}, build = Build}, ChainID, Params, Args) ->
{CallerID, Nonce, Gas, GP, Amount, TTL} = Params,
case hz:contract_create_built(CallerID, Nonce, Gas, GP, Amount, TTL, Build, Args) of
{ok, CreateTX} -> deploy(State, ChainID, CallerID, CreateTX);
Error -> handle_troubling(State, Error)
end;
prep_call4(State = #s{fundef = {Name, Ilk}, con_id = ConID, build = Build}, ChainID, Params, Args) ->
{CallerID, Nonce, Gas, GP, Amount, TTL} = Params,
AACI = maps:get(aaci, Build),
case hz:contract_call(CallerID, Nonce, Gas, GP, Amount, TTL, AACI, ConID, Name, Args) of
{ok, UnsignedTX} ->
case Ilk of
call -> do_call(State, ChainID, CallerID, UnsignedTX);
dryr -> do_dry_run(State, ConID, UnsignedTX)
end;
Error ->
handle_troubling(State, Error)
end.
params(State = #s{kp = #w{wx = KeyPicker}}) ->
ID = wxChoice:getString(KeyPicker, wxChoice:getSelection(KeyPicker)),
PK = unicode:characters_to_binary(ID),
case hz:next_nonce(PK) of
{ok, Nonce} -> params2(State, PK, Nonce);
Error -> handle_troubling(State, Error)
end.
params2(#s{params = Params}, PK, Nonce) ->
case lists:foldl(fun extract/2, {ok, []}, Params) of
{ok, [TTL, GP, Gas, Amount]} -> {ok, {PK, Nonce, Gas, GP, Amount, TTL}};
Error -> Error
end.
extract({Name, Check, Widget}, {Status, Out}) ->
case Check(wxTextCtrl:getValue(Widget)) of
{ok, Value} -> {Status, [Value | Out]};
Error -> {error, [{Name, Error}, Out]}
end.
% TODO: Put some basic checking in here, like for blank strings, at least.
% It should be possible to perform type/parse checks over this since we have
% access to the AACI. But not today.
args(#s{args = ArgFields}) ->
Values = [wxTextCtrl:getValue(W) || #w{wx = W} <- ArgFields],
{ok, Values}.
deploy(State, ChainID, CallerID, CreateTX) ->
case gd_con:sign_call(ChainID, CallerID, CreateTX) of
{ok, SignedTX} -> deploy2(State, SignedTX);
Error -> handle_troubling(State, Error)
end.
deploy2(State = #s{j = J, hash = #w{wx = HashT}, action = #w{wx = ActionB}}, SignedTX) ->
case hz:post_tx(SignedTX) of
{ok, Data = #{"tx_hash" := TXHash}} ->
_ = wxButton:disable(ActionB),
ok = wxButton:setLabel(ActionB, J("Check Transaction Status")),
ok = log(info, "Submitted transaction ~s", [TXHash]),
ok = wxTextCtrl:setValue(HashT, unicode:characters_to_list(TXHash)),
check_tx(State#s{tx_data = Data, status = submitted});
{ok, #{"reason" := Reason}} ->
handle_troubling(State, {error, Reason});
Error ->
handle_troubling(State, Error)
end.
do_call(State, ChainID, CallerID, UnsignedTX) ->
case gd_con:sign_call(ChainID, CallerID, UnsignedTX) of
{ok, SignedTX} -> do_call2(State, SignedTX);
Error -> handle_troubling(State, Error)
end.
do_call2(State = #s{action = #w{wx = ActionB}}, SignedTX) ->
_ = wxButton:disable(ActionB),
case hz:post_tx(SignedTX) of
{ok, #{"reason" := Reason}} -> handle_troubling(State#s{status = rejected}, Reason);
{ok, Data} -> check_tx(State#s{tx_data = Data, status = submitted});
Error -> handle_troubling(State, Error)
end.
do_dry_run(State = #s{action = #w{wx = ActionB}}, ConID, TX) ->
_ = wxButton:disable(ActionB),
case hz:dry_run(TX) of
{ok, Result} -> dry_run2(State#s{tx_info = Result});
Other -> handle_troubling(State, {error, ConID, Other})
end.
dry_run2(State = #s{j = J,
funret = ReturnType,
return = #w{wx = ReturnT},
copy = #w{wx = CopyB},
tx_data = TXData,
tx_info = TXInfo,
hash = #w{wx = HashT},
info = #w{wx = InfoT}}) ->
ReturnV =
case TXInfo of
#{"results" :=
[#{"call_obj" :=
#{"return_type" := "revert",
"return_value" := ReturnCB},
"result" := "ok","type" := "contract_call"}]} ->
io_lib:format("Revert: ~ts", [hz:decode_bytearray(ReturnCB, sophia)]);
#{"results" :=
[#{"call_obj" :=
#{"return_type" := "ok",
"return_value" := ReturnCB},
"result" := "ok","type" := "contract_call"}]} ->
hz:decode_bytearray(ReturnCB, {sophia, ReturnType});
#{"results" :=
[#{"reason" := "Internal error:\n account_not_found\n",
"result" := "error",
"type" := "contract_call"}]} ->
["[", J("The calling account requires funds"), "]"];
Other ->
io_lib:format("???: ~tp", [Other])
end,
_ = wxButton:enable(CopyB),
FormattedHash = io_lib:format("~tp", [TXData]),
FormattedInfo = io_lib:format("~tp", [TXInfo]),
ok = wxTextCtrl:setValue(ReturnT, ReturnV),
ok = wxTextCtrl:setValue(HashT, FormattedHash),
ok = wxTextCtrl:setValue(InfoT, FormattedInfo),
State.
check_tx(State = #s{j = J,
fundef = {_, init},
tx_data = #{"tx_hash" := TXHash},
tx_info = none,
status = submitted,
action = #w{wx = ActionB},
info = #w{wx = InfoT}}) ->
case hz:tx_info(TXHash) of
{ok, Info = #{"call_info" := #{"return_type" := "ok", "contract_id" := ConID}}} ->
ok = tell(info, "Contract deployed: ~p", [Info]),
_ = wxButton:disable(ActionB),
ok = gd_con:open_contract(ConID),
self() ! retire,
State;
{error, "Tx not mined"} ->
ok = wxTextCtrl:setValue(InfoT, J("[Transaction not yet mined.]")),
ok = wxButton:setLabel(ActionB, J("Check Deployment Status")),
_ = wxButton:enable(ActionB),
State;
Other ->
FormattedJunk = io_lib:format("~tp", [Other]),
ok = wxTextCtrl:setValue(InfoT, FormattedJunk),
ok = wxButton:setLabel(ActionB, J("Check Depoyment Status")),
_ = wxButton:enable(ActionB),
State
end;
check_tx(State = #s{j = J,
funret = ReturnType,
tx_data = #{"tx_hash" := TXHash},
tx_info = none,
status = submitted,
return = #w{wx = ReturnT},
copy = #w{wx = CopyB},
action = #w{wx = ActionB},
info = #w{wx = InfoT}}) ->
case hz:tx_info(TXHash) of
{ok, Info = #{"call_info" := #{"return_type" := "ok",
"return_value" := ReturnCB}}} ->
FormattedInfo = io_lib:format("~tp", [Info]),
_ = wxButton:enable(CopyB),
_ = wxButton:disable(ActionB),
ReturnV = hz:decode_bytearray(ReturnCB, {sophia, ReturnType}),
ok = wxTextCtrl:setValue(ReturnT, ReturnV),
ok = wxTextCtrl:setValue(InfoT, FormattedInfo),
State#s{status = included, tx_info = Info};
{ok, Reason = #{"call_info" := #{"return_type" := "revert", "return_value" := ReturnCB}}} ->
_ = wxButton:enable(CopyB),
_ = wxButton:disable(ActionB),
ReturnV = io_lib:format("Revert: ~ts", [hz:decode_bytearray(ReturnCB, sophia)]),
ok = wxTextCtrl:setValue(ReturnT, ReturnV),
FormattedInfo = io_lib:format("~tp", [Reason]),
ok = wxTextCtrl:setValue(InfoT, FormattedInfo),
State#s{status = rejected, tx_info = Reason};
{error, "Tx not mined"} ->
ok = wxTextCtrl:setValue(InfoT, J("[Transaction not yet mined.]")),
ok = wxButton:setLabel(ActionB, J("Check Transaction Status")),
_ = wxButton:enable(ActionB),
State;
Error ->
handle_troubling(State, Error)
end;
check_tx(State = #s{tx_data = TXData,
action = #w{wx = ActionB}}) ->
_ = wxButton:disable(ActionB),
tell(info, "TXData: ~p", [TXData]),
ok = tell("Nothing to check"),
State.
copy(#s{tx_info = none}) ->
ok;
copy(#s{return = #w{wx = ReturnT}}) ->
Output = wxTextCtrl:getValue(ReturnT),
gd_lib:copy_to_clipboard(Output).
textify({integer, _, _}) -> "int";
textify({boolean, _, _}) -> "bool";
textify({{bytes, [I]}, _, _}) -> io_lib:format("bytes(~w)", [I]);
textify({{bytes, any}, _, _}) -> "bytes()";
textify({T, _, _}) when is_atom(T) -> atom_to_list(T);
textify({T, _, _}) when is_list(T) -> T;
textify({T, _, _}) -> io_lib:format("~tp", [T]).
gt_0(S) ->
C = "Must be an integer greater than 0",
R =
try
{ok, list_to_integer(S)}
catch
error:badarg -> {error, {S, C}}
end,
case R of
{ok, N} when N > 0 -> {ok, N};
{ok, N} when N =< 0 -> {error, {S, C}};
Error -> Error
end.
gte_0(S) ->
C = "Must be a non-negative integer.",
R =
try
{ok, list_to_integer(S)}
catch
error:badarg -> {error, {S, C}}
end,
case R of
{ok, N} when N >= 0 -> {ok, N};
{ok, N} when N < 0 -> {error, {S, C}};
Error -> Error
end.
-1393
View File
File diff suppressed because it is too large Load Diff
+589
View File
@@ -0,0 +1,589 @@
%%% @private
%%% The GajuExpress
%%%
%%% 0. User opens GajuDesk and selects the key (very top widget)
%%%
%%% Sending...
%%%
%%% 1. The user inputs the public key/ID of the party the data should be sent to
%%% 2. The user picks the file or directory to send
%%% 3. The user decides whether to sign the package or be anonymous
%%% 4. The user sets the package's TTL
%%% 5. GajuDesk packs up and compresses the bundle.
%%% 6. GajuDesk asks GajuExpress for a quote based on size/time
%%% 7. The price is shown
%%% 8. The user agrees or aborts
%%% 9. If the user agrees, a payment window opens and they send a payment to GajuExpress
%%% 10. GajuDesk polls until the payment is included or the user gives up
%%% 11. Once GajuExpress verifies the payment, the upload begins
%%% 12. Progress bar
%%%
%%%
%%% Receiving...
%%%
%%% 1. User clicks "check for deliveries"
%%% 2. GajuExpress issues an ID signature challenge
%%% 3. GajuDesk asks GajuExpress whether there are any packages waiting for Key
%%% 4. If yes, then the pending deliveries are shown in the delivery panel
%%% 5. The user selects + clicks open (or double clicks) a package
%%% 6. User selects where to unpack it in a file dialog
%%% 7. GajuDesk downloads the package from GajuExpress
%%% 8. Progress bar
%%% 9. File is decrypted and optionally signature verified
%%% 10. GajuExpress deletes their copy of the file
%%% @end
-module(gd_v_express).
-vsn("0.10.0").
-author("Craig Everett <zxq9@zxq9.com>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").
-behavior(wx_object).
%-behavior(gd_v).
-include_lib("wx/include/wx.hrl").
-export([to_front/0, to_front/1, trouble/1]).
-export([pending/1, accounts/1, retire/2]).
-export([start_link/1]).
-export([init/1, terminate/2, code_change/3,
handle_call/3, handle_cast/2, handle_info/2, handle_event/2]).
-include("$zx_include/zx_logger.hrl").
-include("gd.hrl").
-include("gdl.hrl").
-record(s,
{wx = none :: none | wx:wx_object(),
frame = none :: none | wx:wx_object(),
lang = en :: en | jp,
j = none :: none | fun(),
prefs = #{} :: map(),
keys = #w{} :: #w{},
accs = [] :: [#wr{}],
rider = none :: none | pid(),
recvr = none :: none | pid(),
check = #w{} :: #w{},
list = #w{} :: #w{},
dl = #w{} :: #w{},
dest = none :: none | wx:wx_object(),
ttl = none :: none | wx:wx_object(),
path = none :: none | wx:wx_object(),
sign = none :: none | wx:wx_object(),
size = none :: none | wx:wx_object(),
cost = none :: none | wx:wx_object(),
quote = none :: none | pos_integer(),
ul = none :: none | wx:wx_object()}).
%-record(mochila,
% {tar = <<>> :: binary(),
% sig = none :: none | {Key :: binary(), Sig :: binary()}}).
-type meta() :: {Name :: binary(), % UTF8 binary string
Size :: pos_integer(), % Size in bytes
TS :: pos_integer(), % Timestamp is the height at creation
TTL :: pos_integer(), % Expiry height is TS + TTL
Sig :: none | sig()}.
-type sig() :: {ID :: id(),
Sig :: binary()}.
-type id() :: binary(). % ID is binary string of the pubkey, serialized <<"ak_...">>
%%% Interface
-spec to_front() -> ok.
to_front() ->
wx_object:cast(?MODULE, to_front).
-spec to_front(Win) -> ok
when Win :: wx:wx_object().
to_front(Win) ->
wx_object:cast(Win, to_front).
-spec trouble(Info) -> ok
when Info :: term().
trouble(Info) ->
wx_object:cast(?MODULE, {trouble, Info}).
-spec pending(Manifest) -> ok
when Manifest :: [meta()].
pending(Manifest) ->
wx_object:cast(?MODULE, {pending, Manifest}).
-spec accounts(Manifest) -> ok
when Manifest :: [#wr{}].
accounts(Manifest) ->
wx_object:cast(?MODULE, {accounts, Manifest}).
-spec retire(PID, Info) -> ok
when PID :: pid(),
Info :: term().
retire(PID, Info) ->
gen_server:cast(?MODULE, {retire, PID, Info}).
%%% Startup
start_link(Args) ->
wx_object:start_link({local, ?MODULE}, ?MODULE, Args, []).
init({Prefs, {Selected, Keys}}) ->
Lang = maps:get(lang, Prefs, en),
Trans = gd_jt:read_translations(?MODULE),
J = gd_jt:j(Lang, Trans),
Wx = wx:new(),
Frame = wxFrame:new(Wx, ?wxID_ANY, J("GajuExpress")),
Panel = wxWindow:new(Frame, ?wxID_ANY),
TopSz = wxBoxSizer:new(?wxVERTICAL),
_ = wxBoxSizer:add(TopSz, Panel, zxw:flags(wide)),
MainSz = wxBoxSizer:new(?wxVERTICAL),
LR_Sz = wxBoxSizer:new(?wxHORIZONTAL),
KeyP = wxChoice:new(Panel, ?wxID_ANY, [{choices, Keys}]),
KP = #w{name = key_picker, id = wxChoice:getId(KeyP), wx = KeyP},
ZeroBasedSelected = Selected - 1,
ok = wxChoice:setSelection(KeyP, ZeroBasedSelected),
_ = wxStaticBoxSizer:add(MainSz, KeyP, zxw:flags({base, 5})),
DownloadSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, J("Downloads")}]),
DownloadBox = wxStaticBoxSizer:getStaticBox(DownloadSz),
CheckB = #w{wx = CheckW} = make_button(DownloadBox, check, J("Check for Downloads")),
DownloadP = wxListBox:new(DownloadBox, ?wxID_ANY, [{style, ?wxLC_SINGLE_SEL}]),
DL_L = #w{name = list, id = wxListBox:getId(DownloadP), wx = DownloadP},
DownloadB = #w{wx = DownloadW} = make_button(DownloadBox, dl, J("Download")),
_ = wxButton:disable(DownloadW),
_ = wxBoxSizer:add(DownloadSz, CheckW, zxw:flags({base, 5})),
_ = wxBoxSizer:add(DownloadSz, DownloadP, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(DownloadSz, DownloadW, zxw:flags({base, 5})),
UploadSz = wxStaticBoxSizer:new(?wxVERTICAL, Panel, [{label, J("Uploads")}]),
UploadBox = wxStaticBoxSizer:getStaticBox(UploadSz),
DestSz = wxStaticBoxSizer:new(?wxHORIZONTAL, UploadBox, [{label, J("Destination ID")}]),
DestBox = wxStaticBoxSizer:getStaticBox(DestSz),
DestT = wxTextCtrl:new(DestBox, ?wxID_ANY),
_ = wxStaticBoxSizer:add(DestSz, DestT, zxw:flags({wide,5})),
_ = wxStaticBoxSizer:add(UploadSz, DestSz, zxw:flags({wide,5})),
TTL_Sz = wxStaticBoxSizer:new(?wxHORIZONTAL, UploadBox, [{label, J("Transfer Expiration (Days)")}]),
TTL_Box = wxStaticBoxSizer:getStaticBox(TTL_Sz),
TTL_T = wxTextCtrl:new(TTL_Box, ?wxID_ANY, [{value, "7"}]),
_ = wxStaticBoxSizer:add(TTL_Sz, TTL_T, zxw:flags({wide,5})),
_ = wxStaticBoxSizer:add(UploadSz, TTL_Sz, zxw:flags({wide,5})),
PathSz = wxStaticBoxSizer:new(?wxHORIZONTAL, UploadBox, [{label, J("File or Directory")}]),
PathBox = wxStaticBoxSizer:getStaticBox(PathSz),
PathP = wxFilePickerCtrl:new(PathBox, ?wxID_ANY),
_ = wxStaticBoxSizer:add(PathSz, PathP, zxw:flags({wide,5})),
_ = wxStaticBoxSizer:add(UploadSz, PathSz, zxw:flags({wide,5})),
SignSz = wxStaticBoxSizer:new(?wxHORIZONTAL, UploadBox, [{label, J("Transfer Signature")}]),
SignBox = wxStaticBoxSizer:getStaticBox(SignSz),
SignC = wxCheckBox:new(SignBox, ?wxID_ANY, J("Do you want to sign this transfer?")),
_ = wxStaticBoxSizer:add(SignSz, SignC, zxw:flags({wide,5})),
_ = wxStaticBoxSizer:add(UploadSz, SignSz, zxw:flags({wide,5})),
SizeSz = wxStaticBoxSizer:new(?wxHORIZONTAL, UploadBox, [{label, J("Transfer Size")}]),
SizeBox = wxStaticBoxSizer:getStaticBox(SizeSz),
SizeT = wxStaticText:new(SizeBox, ?wxID_ANY, J("[No File or Directory Selected]")),
_ = wxStaticBoxSizer:add(SizeSz, SizeT, zxw:flags({wide,5})),
_ = wxStaticBoxSizer:add(UploadSz, SizeSz, zxw:flags({wide,5})),
CostSz = wxStaticBoxSizer:new(?wxHORIZONTAL, UploadBox, [{label, J("Cost to Transfer")}]),
CostBox = wxStaticBoxSizer:getStaticBox(CostSz),
CostT = wxStaticText:new(CostBox, ?wxID_ANY, "[N/A]"),
_ = wxStaticBoxSizer:add(CostSz, CostT, zxw:flags({wide,5})),
_ = wxStaticBoxSizer:add(UploadSz, CostSz, zxw:flags({wide,5})),
UploadB = #w{wx = UploadW} = make_button(UploadBox, ul, J("Check Quote")),
_ = wxButton:disable(UploadW),
_ = wxStaticBoxSizer:add(UploadSz, UploadW, zxw:flags({base,5})),
_ = wxBoxSizer:add(LR_Sz, DownloadSz, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(LR_Sz, UploadSz, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(MainSz, LR_Sz, zxw:flags({wide, 5})),
ok = wxPanel:setSizer(Panel, MainSz),
ok = wxFrame:setSizer(Frame, TopSz),
ok = wxSizer:layout(TopSz),
NewPrefs =
case maps:is_key(geometry, Prefs) of
true ->
Prefs;
false ->
Display = wxDisplay:new(),
{_, _, W, H} = wxDisplay:getGeometry(Display),
ok = wxDisplay:destroy(Display),
WW = 500,
WH = 350,
X = (W div 2) - (WW div 2),
Y = (H div 2) - (WH div 2),
Prefs#{geometry => {X, Y, WW, WH}}
end,
ok = gd_v:safe_size(Frame, NewPrefs),
ok = wxTextCtrl:connect(DestT, command_text_updated),
ok = wxPanel:dragAcceptFiles(Panel, true),
ok = wxPanel:connect(Panel, drop_files),
ok = wxFrame:connect(Frame, command_button_clicked),
ok = wxFrame:connect(Frame, command_choice_selected),
ok = wxFrame:connect(Frame, close_window),
ok = wxListBox:connect(DownloadP, command_listbox_doubleclicked),
true = wxFrame:show(Frame),
State = #s{wx = Wx, frame = Frame, lang = Lang, j = J, prefs = Prefs,
keys = KP, accs = Keys,
check = CheckB, list = DL_L,
dl = DownloadB,
dest = DestT, ttl = TTL_T, path = PathP, sign = SignC,
size = SizeT, cost = CostT,
ul = UploadB},
{Frame, State}.
make_button(Parent, Name, Label) ->
B = wxButton:new(Parent, ?wxID_ANY, [{label, Label}]),
#w{name = Name, id = wxButton:getId(B), wx = B}.
%%% wx_object
handle_call(Unexpected, From, State) ->
ok = log(warning, "Unexpected call from ~tp: ~tp~n", [From, Unexpected]),
{noreply, State}.
handle_cast({pending, Manifest}, State) ->
NewState = do_pending(Manifest, State),
{noreply, NewState};
handle_cast({accounts, Manifest}, State) ->
NewState = do_accounts(Manifest, State),
{noreply, NewState};
handle_cast({retire, PID, Info}, State) ->
NewState = do_retire(PID, Info, State),
{noreply, NewState};
handle_cast(to_front, State = #s{frame = Frame}) ->
ok = ensure_shown(Frame),
ok = wxFrame:raise(Frame),
{noreply, State};
handle_cast({trouble, Info}, State) ->
ok = handle_troubling(State, Info),
{noreply, State};
handle_cast(Unexpected, State) ->
ok = log(warning, "Unexpected cast: ~tp~n", [Unexpected]),
{noreply, State}.
handle_info(Unexpected, State) ->
ok = log(warning, "Unexpected info: ~tp~n", [Unexpected]),
{noreply, State}.
handle_event(#wx{event = #wxCommand{type = command_button_clicked}, id = ID},
State = #s{check = #w{id = ID}}) ->
NewState = do_check(State),
{noreply, NewState};
handle_event(#wx{event = #wxCommand{type = command_button_clicked}, id = ID},
State = #s{dl = #w{id = ID}}) ->
NewState = do_dl(State),
{noreply, NewState};
handle_event(#wx{event = #wxCommand{type = command_button_clicked}, id = ID},
State = #s{ul = #w{id = ID}}) ->
NewState = do_ul(State),
{noreply, NewState};
handle_event(#wx{event = #wxCommand{type = command_choice_selected}}, State) ->
ok = kill_recvr(State),
{noreply, State};
handle_event(#wx{event = #wxCommand{type = command_listbox_doubleclicked}}, State) ->
NewState = do_dl(State),
{noreply, NewState};
handle_event(#wx{event = #wxCommand{type = command_text_updated}}, State) ->
NewState = do_check_ul_button(State),
{noreply, NewState};
handle_event(#wx{event = #wxDropFiles{files = Files}}, State) ->
NewState = do_drop(Files, State),
{noreply, NewState};
handle_event(#wx{event = #wxClose{}}, State) ->
ok = do_close(State),
{noreply, State};
handle_event(Event, State) ->
ok = tell(info, "Unexpected event ~tp State: ~tp~n", [Event, State]),
{noreply, State}.
handle_troubling(#s{frame = Frame}, Info) ->
zxw:show_message(Frame, Info).
code_change(_, State, _) ->
{ok, State}.
terminate(wx_deleted, _) ->
wx:destroy();
terminate(Reason, State) ->
ok = log(info, "Reason: ~tp, State: ~tp", [Reason, State]),
wx:destroy().
%%% doers
do_pending(Manifest, State) ->
ok = tell(info, "Would do_pending: ~p", [Manifest]),
State.
do_accounts(Manifest, State) ->
ok = tell(info, "Would do_accounts: ~p", [Manifest]),
State.
do_check(State = #s{recvr = none, keys = #w{wx = KeyP}}) ->
case wxChoice:getStringSelection(KeyP) of
"" ->
State;
KeyID ->
PubKey = list_to_binary(KeyID),
PID = spawn_link(gd_n_recvr, init, [PubKey, {"localhost", 7777}]),
do_check2(State#s{recvr = PID})
end;
do_check(State = #s{recvr = PID}) ->
case gd_n_recvr:check(PID) of
ok -> State;
{ok, Challenge} -> challenge(State, Challenge)
end.
do_check2(State = #s{recvr = PID}) ->
case gd_n_recvr:check(PID) of
{ok, Challenge} ->
challenge(State, Challenge);
{error, Reason} ->
ok = tell(info, "GajuExpress connection failed with: ~p", [Reason]),
State#s{recvr = none}
end.
challenge(State = #s{recvr = PID, keys = #w{wx = KeyP}}, Challenge) ->
case wxChoice:getStringSelection(KeyP) of
"" ->
ok = gd_n_recvr:stop(PID),
State;
KeyID ->
PubKey = list_to_binary(KeyID),
prompt_challenge(State, PubKey, Challenge)
end.
%% TODO: This should really be a live modal instead.
%% It needs to have a countdown, possibly a server-side reset negotiation,
%% and be able to react to server-side actions like the socket being shut down.
prompt_challenge(State = #s{recvr = PID, frame = Frame, j = J}, PubKey, Challenge) ->
Dialog = wxDialog:new(Frame, ?wxID_ANY, J("Message Signature Request")),
Sizer = wxBoxSizer:new(?wxVERTICAL),
Instruction = J("GajuExpress is requesting an authentication signature."),
InstTx = wxStaticText:new(Dialog, ?wxID_ANY, Instruction),
AcctSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Signature Account")}]),
AcctTx = wxStaticText:new(Dialog, ?wxID_ANY, PubKey),
_ = wxStaticBoxSizer:add(AcctSz, AcctTx, zxw:flags({wide, 5})),
MessSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Message")}]),
MessStyle = ?wxTE_MULTILINE bor ?wxTE_READONLY,
MessTx = wxTextCtrl:new(Dialog, ?wxID_ANY, [{value, Challenge}, {style, MessStyle}]),
_ = wxStaticBoxSizer:add(MessSz, MessTx, zxw:flags({wide, 5})),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, InstTx, zxw:flags({base, 5})),
_ = wxBoxSizer:add(Sizer, AcctSz, zxw:flags({base, 5})),
_ = wxBoxSizer:add(Sizer, MessSz, zxw:flags({wide, 5})),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(base)),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxDialog:setSize(Dialog, {600, 300}),
ok = wxBoxSizer:layout(Sizer),
ok = wxFrame:center(Dialog),
Outcome =
case wxDialog:showModal(Dialog) of
?wxID_OK -> ok;
?wxID_CANCEL -> cancel
end,
ok = wxDialog:destroy(Dialog),
case Outcome of
ok ->
handle_challenge(State, PubKey, Challenge);
cancel ->
ok = gd_n_recvr:stop(PID),
State
end.
handle_challenge(State = #s{recvr = PID}, PubKey, Challenge) ->
case gd_con:sign_binary(PubKey, Challenge) of
{ok, Sig} ->
respond(State, Sig);
{error, bad_key} ->
ok = gd_n_recvr:stop(PID),
State
end.
respond(State = #s{recvr = PID}, Sig) ->
ok =
case gd_n_recvr:response(PID, Sig) of
ok -> ok;
{error, Reason} -> ok = tell(info, "~p: ~p", [PID, Reason])
end,
State.
do_dl(State) ->
ok = tell(info, "Would do_dl."),
State.
do_check_ul_button(State = #s{ul = #w{wx = UL_B}}) ->
_ = wxButton:enable(UL_B, [{enable, should_enable_quote(State)}]),
State.
do_drop([Path], State = #s{path = PathP, ul = #w{wx = UL_B}}) ->
ok = tell(info, "Path: ~ts", [Path]),
ok =
case filelib:is_file(Path) of
true ->
ok = wxFilePickerCtrl:setPath(PathP, Path),
_ = wxButton:enable(UL_B, [{enable, should_enable_quote(State)}]),
ok;
false ->
tell(warning, "Thank you, Mario! But our file is in a different path.")
end,
State;
do_drop(Paths, State) ->
ok = tell(info, "Paths: ~tp", [Paths]),
ok = tell(info, "THIS IS A NO NO"),
State.
should_enable_quote(#s{dest = DestT, path = PathP}) ->
DestKey = wxTextCtrl:getValue(DestT),
Path = wxFilePickerCtrl:getPath(PathP),
length(DestKey) > 0 andalso length(Path) > 0.
%do_ul(State = #s{quote = none, rider = none}) ->
% check_quote(State);
do_ul(State) ->
ok = tell(info, "Would do_ul."),
State.
%check_quote(State = #s{dest = DestT}) ->
% Dest = wxTextCtrl:getValue(DestT),
% case gmser_api_encoder:safe_decode(account_pubkey, list_to_binary(Dest)) of
% {ok, PubKey} ->
% check_quote2(State, PubKey);
% {error, Reason} ->
% tell(warning, "Destination Key decode failed with: ~p", [Reason]),
% State
% end.
%check_quote2(State = #s{path = PathP}, PubKey) ->
% Path = wxFilePickerCtrl:getPath(PathP),
% case filelib:is_file(Path) of
% true ->
% check_quote3(State, PubKey, Path);
% false ->
% tell(info, "File path isn't a file"),
% State
% end.
%check_quote3(State = #s{ttl = TTL_T}, PubKey, Path) ->
% TTL_S = wxTextCtrl:getValue(TTL_T),
% case string_to_int(TTL_S) of
% {ok, TTL} ->
% check_quote4(State, PubKey, Path, TTL);
% error ->
% tell(info, "TTL isn't an integer"),
% State
% end.
%check_quote4(State = #s{sign = SigC}, PubKey, Path, TTL) ->
% SigYN = wxCheckBox:is_checked(SigC),
% check_quote5(State, PubKey, Path, TTL, SigYN).
%check_quote5(State, PubKey, Path, TTL, SigYN) ->
% Tar = tar_path(),
% case erl_tar:create(TarPath, Path, [compressed, dereference]) of
% ok ->
% check_quote6(State, PubKey, TTL, SigYN, Tar);
% {error, Reason} ->
% tell(warning, "Tar operation failed with: ~p", [Reason]),
% State
% end.
%check_quote6(State, PubKey, TTL, SigYN, Tar) ->
%tar_path() ->
% TarFile = integer_to_list(erlang:system_time(seconds)) ++ "tar.gz",
% filename:join(zx_lib:path(tmp, "otpr", "gajudesk"), TarFile).
%check_quote6(State, PubKey, Path, TTL, SigYN, Tar) ->
% PID = spawn_link(gd_n_rider, init, [PubKey, {"localhost", 7777}]),
%string_to_int(S) ->
% try
% {ok, list_to_integer(S)}
% catch
% error:bad_arg -> error
% end.
do_close(#s{frame = Frame, prefs = Prefs}) ->
Geometry =
case wxTopLevelWindow:isMaximized(Frame) of
true ->
max;
false ->
{X, Y} = wxWindow:getPosition(Frame),
{W, H} = wxWindow:getSize(Frame),
{X, Y, W, H}
end,
NewPrefs = maps:put(geometry, Geometry, Prefs),
ok = gd_con:save(?MODULE, NewPrefs),
ok = wxWindow:destroy(Frame).
%default_name() ->
% {{YY, MM, DD}, {Hr, Mn, Sc}} = calendar:local_time(),
% Form = "~4.10.0B-~2.10.0B-~2.10.0B_~2.10.0B-~2.10.0B-~2.10.0B",
% Name = io_lib:format(Form, [YY, MM, DD, Hr, Mn, Sc]),
% unicode:characters_to_list(Name ++ ".gaju").
kill_recvr(#s{recvr = none}) -> ok;
kill_recvr(#s{recvr = PID}) -> gd_n_recvr:stop(PID).
do_retire(PID, Info, State = #s{rider = PID}) ->
ok = tell(info, "Rider retired with: ~p", [Info]),
State#s{rider = none};
do_retire(PID, Info, State = #s{recvr = PID}) ->
ok = tell(info, "Recvr retired with: ~p", [Info]),
State#s{recvr = none};
do_retire(PID, Info, State) ->
ok = tell(info, "~p retired with: ~p", [PID, Info]),
State.
ensure_shown(Frame) ->
case wxWindow:isShown(Frame) of
true ->
ok;
false ->
true = wxFrame:show(Frame),
ok
end.
+915
View File
@@ -0,0 +1,915 @@
-module(gd_v_fateweaver).
-vsn("0.10.0").
-author("Craig Everett <craigeverett@qpq.swiss>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").
-behavior(wx_object).
%-behavior(gd_v).
-include_lib("wx/include/wx.hrl").
-export([to_front/1]).
-export([set_manifest/1, open_contract/1, write_console/2, call_result/2, dryrun_result/2, trouble/1]).
-export([start_link/1]).
-export([init/1, terminate/2, code_change/3,
handle_call/3, handle_cast/2, handle_info/2, handle_event/2]).
-include("$zx_include/zx_logger.hrl").
-include("gd.hrl").
-include("gdl.hrl").
% Contract functions in an ACI
-record(f,
{name = <<"">> :: binary(),
call = #w{} :: #w{},
dryrun = #w{} :: none | #w{},
args = [] :: [argt()]}).
% Code book pages
-record(p,
{path = {file, ""} :: {file, file:filename()} | {hash, binary()},
win = none :: none | wx:wx_object(),
code = none :: none | wxTextCtrl:wxTextCtrl()}).
% Contract pages
-record(c,
{id = <<"">> :: binary(),
win = none :: none | wx:wx_object(),
code = none :: none | wxTextCtrl:wxTextCtrl(),
cons = none :: none | wxTextCtrl:wxTextCtrl(),
build = none :: none | map(),
funs = {#w{}, []} :: {#w{}, [#f{}]}}).
% State
-record(s,
{wx = none :: none | wx:wx_object(),
frame = none :: none | wx:wx_object(),
lang = en :: en | jp,
j = none :: none | fun(),
prefs = #{} :: map(),
buttons = #{} :: #{WX_ID :: integer() := #w{}},
tabs = none :: none | wx:wx_object(),
code = {none, []} :: {Codebook :: none | wx:wx_object(), Pages :: [#p{}]},
cons = {none, []} :: {Consbook :: none | wx:wx_object(), Pages :: [#c{}]}}).
% TODO: Spec HZ AACIs.
-type argt() :: term(). % FIXME: Whatever HZ returns in the AACI as an arg type.
%%% Interface
-spec to_front(Win) -> ok
when Win :: wx:wx_object().
to_front(Win) ->
wx_object:cast(Win, to_front).
% TODO: Probably kill this
-spec set_manifest(Entries) -> ok
when Entries :: list().
set_manifest(Entries) ->
case is_pid(whereis(?MODULE)) of
true -> wx_object:cast(?MODULE, {set_manifest, Entries});
false -> ok
end.
-spec open_contract(Address) -> ok
when Address :: binary() | string().
open_contract(Address) when is_binary(Address) ->
wx_object:cast(?MODULE, {open_contract, Address});
open_contract(Address) when is_list(Address) ->
open_contract(list_to_binary(Address)).
-spec write_console(ConID, Message) -> ok
when ConID :: gajudesk:id(),
Message :: unicode:chardata().
write_console(ConID, Message) ->
wx_object:cast(?MODULE, {write_console, ConID, Message}).
-spec call_result(ConID, CallInfo) -> ok
when ConID :: gajudesk:id(),
CallInfo :: map().
call_result(ConID, CallInfo) ->
wx_object:cast(?MODULE, {call_result, ConID, CallInfo}).
-spec dryrun_result(ConID, CallInfo) -> ok
when ConID :: gajudesk:id(),
CallInfo :: map().
dryrun_result(ConID, CallInfo) ->
wx_object:cast(?MODULE, {dryrun_result, ConID, CallInfo}).
-spec trouble(Info) -> ok
when Info :: term().
trouble(Info) ->
wx_object:cast(?MODULE, {trouble, Info}).
%%% Startup Functions
start_link(Args) ->
wx_object:start_link({local, ?MODULE}, ?MODULE, Args, []).
init({Prefs, Manifest}) ->
Lang = maps:get(lang, Prefs, en),
Trans = gd_jt:read_translations(?MODULE),
J = gd_jt:j(Lang, Trans),
Wx = wx:new(),
Frame = wxFrame:new(Wx, ?wxID_ANY, "FateWeaver"),
MainSz = wxBoxSizer:new(?wxVERTICAL),
TopBook = wxNotebook:new(Frame, ?wxID_ANY, [{style, ?wxBK_DEFAULT}]),
{LWin, LButtons, Codebook} = make_l_win(TopBook, J),
{RWin, RButtons, Consbook} = make_r_win(TopBook, J),
ButtonMap = maps:merge(LButtons, RButtons),
true = wxNotebook:addPage(TopBook, LWin, J("Contract Editor"), []),
true = wxNotebook:addPage(TopBook, RWin, J("Deployed Contracts"), []),
State =
#s{wx = Wx, frame = Frame,
j = J, prefs = Prefs,
buttons = ButtonMap, tabs = TopBook,
code = {Codebook, []}, cons = {Consbook, []}},
_ = wxSizer:add(MainSz, TopBook, zxw:flags(wide)),
_ = wxFrame:setSizer(Frame, MainSz),
_ = wxSizer:layout(MainSz),
ok = gd_v:safe_size(Frame, Prefs),
ok = wxFrame:connect(Frame, close_window),
ok = wxFrame:connect(Frame, command_button_clicked),
ok = wxFrame:center(Frame),
true = wxFrame:show(Frame),
NewState = add_code_pages(State, Manifest),
{Frame, NewState}.
make_l_win(TopBook, J) ->
Win = wxWindow:new(TopBook, ?wxID_ANY),
MainSz = wxBoxSizer:new(?wxVERTICAL),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
ButtonTemplates =
[{new, J("New")},
{open, J("Open")},
{save, J("Save")},
{rename, J("Save (rename)")},
{deploy, J("Deploy")},
{close_source, J("Close")}],
MakeButton =
fun({Name, Label}) ->
B = wxButton:new(Win, ?wxID_ANY, [{label, Label}]),
#w{name = Name, id = wxButton:getId(B), wx = B}
end,
Buttons = lists:map(MakeButton, ButtonTemplates),
AddButton = fun(#w{wx = B}) -> wxSizer:add(ButtSz, B, zxw:flags(wide)) end,
Codebook = wxNotebook:new(Win, ?wxID_ANY, [{style, ?wxBK_DEFAULT}]),
ok = lists:foreach(AddButton, Buttons),
_ = wxSizer:add(MainSz, ButtSz, zxw:flags(base)),
_ = wxSizer:add(MainSz, Codebook, zxw:flags(wide)),
_ = wxWindow:setSizer(Win, MainSz),
MapButton = fun(B = #w{id = I}, M) -> maps:put(I, B, M) end,
ButtonMap = lists:foldl(MapButton, #{}, Buttons),
{Win, ButtonMap, Codebook}.
make_r_win(TopBook, J) ->
Win = wxWindow:new(TopBook, ?wxID_ANY),
MainSz = wxBoxSizer:new(?wxVERTICAL),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
ButtonTemplates =
[{load, J("Load from Chain")},
{edit, J("Copy to Editor")},
{close_instance, J("Close")}],
MakeButton =
fun({Name, Label}) ->
B = wxButton:new(Win, ?wxID_ANY, [{label, Label}]),
#w{name = Name, id = wxButton:getId(B), wx = B}
end,
Buttons = lists:map(MakeButton, ButtonTemplates),
AddButton = fun(#w{wx = B}) -> wxSizer:add(ButtSz, B, zxw:flags(wide)) end,
Codebook = wxNotebook:new(Win, ?wxID_ANY, [{style, ?wxBK_DEFAULT}]),
ok = lists:foreach(AddButton, Buttons),
_ = wxSizer:add(MainSz, ButtSz, zxw:flags(base)),
_ = wxSizer:add(MainSz, Codebook, zxw:flags(wide)),
_ = wxWindow:setSizer(Win, MainSz),
MapButton = fun(B = #w{id = I}, M) -> maps:put(I, B, M) end,
ButtonMap = lists:foldl(MapButton, #{}, Buttons),
{Win, ButtonMap, Codebook}.
add_code_pages(State, Files) ->
lists:foldl(fun add_code_page/2, State, Files).
%%% OTP callbacks
handle_call(Unexpected, From, State) ->
ok = log(warning, "Unexpected call from ~tp: ~tp~n", [From, Unexpected]),
{noreply, State}.
handle_cast(to_front, State = #s{frame = Frame}) ->
ok = wxFrame:raise(Frame),
{noreply, State};
handle_cast({open_contract, Address}, State) ->
NewState = load2(State, Address),
{noreply, NewState};
handle_cast({write_console, ConID, Message}, State) ->
ok = do_write_console(State, ConID, Message),
{noreply, State};
handle_cast({call_result, ConID, CallInfo}, State) ->
ok = do_call_result(State, ConID, CallInfo),
{noreply, State};
handle_cast({dryrun_result, ConID, CallInfo}, State) ->
ok = do_dryrun_result(State, ConID, CallInfo),
{noreply, State};
handle_cast({trouble, Info}, State) ->
NewState = handle_troubling(State, Info),
{noreply, NewState};
handle_cast(Unexpected, State) ->
ok = log(warning, "Unexpected cast: ~tp~n", [Unexpected]),
{noreply, State}.
handle_info(Unexpected, State) ->
ok = log(warning, "Unexpected info: ~tp~n", [Unexpected]),
{noreply, State}.
handle_event(E = #wx{event = #wxCommand{type = command_button_clicked},
id = ID},
State = #s{buttons = Buttons}) ->
NewState =
case maps:get(ID, Buttons, undefined) of
#w{name = new} -> new_file(State);
#w{name = open} -> open(State);
#w{name = save} -> save(State);
#w{name = rename} -> rename(State);
#w{name = deploy} -> deploy(State);
#w{name = close_source} -> close_source(State);
#w{name = load} -> load(State);
#w{name = edit} -> edit(State);
#w{name = close_instance} -> close_instance(State);
#w{name = Name} -> clicked(State, Name);
undefined ->
tell("Received message: ~w", [E]),
State
end,
{noreply, NewState};
handle_event(#wx{event = Event = #wxStyledText{type = stc_styleneeded}, obj = Win}, State) ->
ok = style(State, Win, Event),
{noreply, State};
handle_event(#wx{event = #wxClose{}}, State = #s{frame = Frame, prefs = Prefs}) ->
Geometry =
case wxTopLevelWindow:isMaximized(Frame) of
true ->
max;
false ->
{X, Y} = wxWindow:getPosition(Frame),
{W, H} = wxWindow:getSize(Frame),
{X, Y, W, H}
end,
NewPrefs = maps:put(geometry, Geometry, Prefs),
ok = gd_con:save(?MODULE, NewPrefs),
ok = wxWindow:destroy(Frame),
{noreply, State};
handle_event(Event, State) ->
ok = tell(info, "Unexpected event ~tp State: ~tp~n", [Event, State]),
{noreply, State}.
handle_troubling(State = #s{frame = Frame}, Info) ->
ok = zxw:show_message(Frame, Info),
State.
code_change(_, State, _) ->
{ok, State}.
terminate(wx_deleted, _) ->
wx:destroy();
terminate(Reason, State) ->
ok = log(info, "Reason: ~tp, State: ~tp", [Reason, State]),
wx:destroy().
%%% Doers
style(#s{code = {_, Pages}}, Win, Event) ->
case lists:keyfind(Win, #p.win, Pages) of
#p{code = STC} ->
gd_sophia_editor:update(Event, STC);
false ->
tell("Received bogus style event.~nWin: ~p~nEvent: ~p", [Win, Event])
end.
clicked(State = #s{cons = {Consbook, Contracts}}, FunDef) ->
ok =
case wxNotebook:getSelection(Consbook) of
?wxNOT_FOUND ->
tell(warning, "Inconcievable! No deployed contract page is selected!");
Index ->
#c{id = ConID, build = Build} = lists:nth(Index + 1, Contracts),
gd_con:prompt_call(FunDef, ConID, Build)
end,
State.
do_write_console(#s{tabs = TopBook, cons = {Consbook, Contracts}}, ConID, Message) ->
case lookup_contract(ConID, Contracts) of
{#c{cons = Console}, ZeroIndex} ->
_ = wxNotebook:changeSelection(TopBook, 1),
_ = wxNotebook:changeSelection(Consbook, ZeroIndex),
Out = [Message, "\n\n"],
wxTextCtrl:appendText(Console, Out);
error ->
tell(info, "Received result for ~p:~n~p ", [ConID, Message])
end.
do_call_result(State, ConID, CallInfo) ->
Message = io_lib:format("Call Result:~n~p", [CallInfo]),
do_write_console(State, ConID, Message).
do_dryrun_result(State, ConID, CallInfo) ->
Message = io_lib:format("Call Result:~n~p", [CallInfo]),
do_write_console(State, ConID, Message).
lookup_contract(ConID, Contracts) ->
lookup_contract(ConID, Contracts, 0).
lookup_contract(ConID, [Contract = #c{id = ConID} | _], I) ->
{Contract, I};
lookup_contract(ConID, [#c{} | T], I) ->
lookup_contract(ConID, T, I + 1);
lookup_contract(_, [], _) ->
error.
add_code_page(State = #s{code = {Codebook, Pages}}, File) ->
case keyfind_index({file, File}, #p.path, Pages) of
error ->
add_code_page2(State, File);
{ok, Index} ->
_ = wxNotebook:setSelection(Codebook, Index - 1),
State
end.
add_code_page2(State = #s{j = J}, {file, File}) ->
case file:read_file(File) of
{ok, Bin} ->
case unicode:characters_to_list(Bin) of
Code when is_list(Code) ->
add_code_page(State, {file, File}, Code);
Error ->
Message = io_lib:format(J("Opening ~p failed with: ~p"), [File, Error]),
handle_troubling(State, Message)
end;
{error, Reason} ->
Message = io_lib:format(J("Opening ~p failed with: ~p"), [File, Reason]),
handle_troubling(State, Message)
end;
add_code_page2(State, {hash, Address}) ->
open_hash2(State, Address).
add_code_page(State = #s{tabs = TopBook, code = {Codebook, Pages}}, Location, Code) ->
Window = wxWindow:new(Codebook, ?wxID_ANY),
PageSz = wxBoxSizer:new(?wxHORIZONTAL),
CodeTx = gd_sophia_editor:new(Window),
ok = gd_sophia_editor:set_text(CodeTx, Code),
_ = wxSizer:add(PageSz, CodeTx, zxw:flags(wide)),
ok = wxWindow:setSizer(Window, PageSz),
ok = wxSizer:layout(PageSz),
_ = wxNotebook:changeSelection(TopBook, 0),
FileName =
case Location of
{file, Path} -> filename:basename(Path);
{hash, Addr} -> Addr
end,
ok = wxStyledTextCtrl:connect(Window, stc_styleneeded),
true = wxNotebook:addPage(Codebook, Window, FileName, [{bSelect, true}]),
Page = #p{path = Location, win = Window, code = CodeTx},
NewPages = Pages ++ [Page],
State#s{code = {Codebook, NewPages}}.
new_file(State = #s{frame = Frame, j = J, prefs = Prefs}) ->
DefaultDir =
case maps:find(dir, Prefs) of
{ok, PrefDir} ->
PrefDir;
error ->
case os:getenv("ZOMP_DIR") of
"" -> file:get_pwd();
D -> filename:basename(D)
end
end,
Options =
[{message, J("Save Location")},
{defaultDir, DefaultDir},
{defaultFile, "my_contract.aes"},
{wildCard, "*.aes"},
{style, ?wxFD_SAVE bor ?wxFD_OVERWRITE_PROMPT}],
Dialog = wxFileDialog:new(Frame, Options),
NewState =
case wxFileDialog:showModal(Dialog) of
?wxID_OK ->
Dir = wxFileDialog:getDirectory(Dialog),
case wxFileDialog:getFilename(Dialog) of
"" ->
State;
Name ->
File =
case filename:extension(Name) of
".aes" -> Name;
_ -> Name ++ ".aes"
end,
Path = filename:join(Dir, File),
NewPrefs = maps:put(dir, Dir, Prefs),
NextState = State#s{prefs = NewPrefs},
add_code_page(NextState, {file, Path}, "")
end;
?wxID_CANCEL ->
State
end,
ok = wxFileDialog:destroy(Dialog),
NewState.
deploy(State = #s{code = {Codebook, Pages}}) ->
case wxNotebook:getSelection(Codebook) of
?wxNOT_FOUND ->
State;
Index ->
#p{code = CodeTx} = lists:nth(Index + 1, Pages),
Source = gd_sophia_editor:get_text(CodeTx),
deploy2(State, Source)
end.
deploy2(State, Source) ->
ok =
case compile(Source) of
{ok, Build} -> gd_con:prompt_call({"init", init}, init, Build);
Other -> tell(info, "Compilation Failed!~n~tp", [Other])
end,
State.
open(State = #s{frame = Frame, j = J}) ->
Dialog = wxDialog:new(Frame, ?wxID_ANY, J("Open Contract Source")),
Sizer = wxBoxSizer:new(?wxVERTICAL),
Choices = wxRadioBox:new(Dialog,
?wxID_ANY,
J("Select Origin"),
?wxDefaultPosition,
?wxDefaultSize,
[J("From File"), J("From Hash")],
[{majorDim, 1}]),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
_ = wxSizer:add(Sizer, Choices, zxw:flags(wide)),
_ = wxSizer:add(Sizer, ButtSz, zxw:flags(wide)),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxDialog:setSize(Dialog, {250, 170}),
ok = wxBoxSizer:layout(Sizer),
Choice =
case wxDialog:showModal(Dialog) of
?wxID_OK ->
case wxRadioBox:getSelection(Choices) of
0 -> file;
1 -> hash;
?wxNOT_FOUND -> none
end;
?wxID_CANCEL ->
cancel
end,
ok = wxDialog:destroy(Dialog),
case Choice of
file ->
open_file(State);
hash ->
open_hash(State);
none ->
ok = tell(info, "No selection."),
State;
cancel ->
ok = tell(info, "Cancelled."),
State
end.
open_file(State = #s{frame = Frame, j = J, prefs = Prefs}) ->
DefaultDir =
case maps:find(dir, Prefs) of
{ok, PrefDir} ->
PrefDir;
error ->
case os:getenv("ZOMP_DIR") of
"" -> file:get_pwd();
D -> filename:basename(D)
end
end,
Options =
[{message, J("Load Contract Source")},
{defaultDir, DefaultDir},
{wildCard, "*.aes"},
{style, ?wxFD_OPEN}],
Dialog = wxFileDialog:new(Frame, Options),
NewState =
case wxFileDialog:showModal(Dialog) of
?wxID_OK ->
Dir = wxFileDialog:getDirectory(Dialog),
case wxFileDialog:getFilename(Dialog) of
"" ->
State;
Name ->
File =
case filename:extension(Name) of
".aes" -> Name;
_ -> Name ++ ".aes"
end,
Path = filename:join(Dir, File),
NewPrefs = maps:put(dir, Dir, Prefs),
NextState = State#s{prefs = NewPrefs},
add_code_page(NextState, {file, Path})
end;
?wxID_CANCEL ->
State
end,
ok = wxFileDialog:destroy(Dialog),
NewState.
open_hash(State = #s{frame = Frame, j = J}) ->
Title = J("Retrieve Contract Source"),
Label = J("Address Hash"),
case zxw_modal_text:show(Frame, Title, [{label, Label}]) of
{ok, Address = "ct_" ++ _} -> open_hash2(State, list_to_binary(Address));
{ok, Address = "th_" ++ _} -> get_contract_from_tx(State, list_to_binary(Address));
{ok, Turd} -> handle_troubling(State, {bad_address, Turd});
cancel -> State
end.
get_contract_from_tx(State, Address) ->
case hz:tx_info(Address) of
{ok, #{"call_info" := #{"contract_id" := Contract}}} ->
open_hash2(State, Contract);
{ok, Other} ->
handle_troubling(State, {bad_address, Other});
Error ->
handle_troubling(State, Error)
end.
open_hash2(State, Address) ->
case hz:contract_source(Address) of
{project, [{Name, Source}]} ->
ok = tell("Retrieved ~p from ~p", [Name, Address]),
open_hash3(State, Address, Source);
{ok, Source} ->
ok = tell("Retrieved uncompressed source of ~p", [Address]),
open_hash3(State, Address, Source);
Error ->
handle_troubling(State, Error)
end.
open_hash3(State, Address, Source) ->
% TODO: Compile on load and verify the deployed hash for validity.
case compile(Source) of
{ok, _Build} ->
add_code_page(State, {hash, Address}, Source);
Other ->
ok = tell(info, "Compilation Failed!~n~tp", [Other]),
State
end.
save(State = #s{prefs = Prefs, code = {Codebook, Pages}}) ->
case wxNotebook:getSelection(Codebook) of
?wxNOT_FOUND ->
State;
Index ->
case lists:nth(Index + 1, Pages) of
#p{path = {file, Path}, code = Widget} ->
Source = gd_sophia_editor:get_text(Widget),
case filelib:ensure_dir(Path) of
ok ->
case file:write_file(Path, Source) of
ok -> State;
Error -> handle_troubling(State, Error)
end;
Error ->
handle_troubling(State, Error)
end;
Page = #p{path = {hash, Hash}, code = Widget} ->
DefDir =
case maps:find(dir, Prefs) of
{ok, PrefDir} ->
PrefDir;
error ->
case os:getenv("ZOMP_DIR") of
"" -> file:get_pwd();
D -> filename:basename(D)
end
end,
DefName = unicode:characters_to_list([Hash, ".aes"]),
save_dialog(State, DefDir, DefName, Widget, Index, Page)
end
end.
rename(State = #s{code = {Codebook, Pages}}) ->
case wxNotebook:getSelection(Codebook) of
?wxNOT_FOUND ->
State;
Index ->
case lists:nth(Index + 1, Pages) of
Page = #p{path = {file, Path}, code = Widget} ->
DefDir = filename:dirname(Path),
DefName = filename:basename(Path),
save_dialog(State, DefDir, DefName, Widget, Index, Page);
#p{path = {hash, _}} ->
save(State)
end
end.
save_dialog(State = #s{frame = Frame, j = J, prefs = Prefs, code = {Codebook, Pages}},
DefDir, DefName, Widget, Index, Page) ->
Options =
[{message, J("Save Location")},
{defaultDir, DefDir},
{defaultFile, DefName},
{wildCard, "*.aes"},
{style, ?wxFD_SAVE bor ?wxFD_OVERWRITE_PROMPT}],
Dialog = wxFileDialog:new(Frame, Options),
NewState =
case wxFileDialog:showModal(Dialog) of
?wxID_OK ->
Dir = wxFileDialog:getDirectory(Dialog),
case wxFileDialog:getFilename(Dialog) of
"" ->
State;
Name ->
File =
case filename:extension(Name) of
".aes" -> Name;
_ -> Name ++ ".aes"
end,
NewPath = filename:join(Dir, File),
Source = gd_sophia_editor:get_text(Widget),
case filelib:ensure_dir(NewPath) of
ok ->
case file:write_file(NewPath, Source) of
ok ->
true = wxNotebook:setPageText(Codebook, Index, File),
NewPrefs = maps:put(dir, Dir, Prefs),
NewPage = Page#p{path = {file, NewPath}},
NewPages = store_nth(Index + 1, NewPage, Pages),
NewCode = {Codebook, NewPages},
State#s{prefs = NewPrefs, code = NewCode};
Error ->
handle_troubling(State, Error)
end;
Error ->
handle_troubling(State, Error)
end
end;
?wxID_CANCEL ->
State
end,
ok = wxFileDialog:destroy(Dialog),
NewState.
close_source(State = #s{code = {Codebook, Pages}}) ->
case wxNotebook:getSelection(Codebook) of
?wxNOT_FOUND ->
State;
Index ->
NewPages = drop_nth(Index + 1, Pages),
true = wxNotebook:deletePage(Codebook, Index),
State#s{code = {Codebook, NewPages}}
end.
load(State = #s{frame = Frame, j = J}) ->
% TODO: Extract the exact compiler version, load it, and use only that or fail if
% the specific version is unavailable.
% TODO: Compile on load and verify the deployed hash for validity.
Title = J("Retrieve Contract Source"),
Label = J("Address Hash"),
case zxw_modal_text:show(Frame, Title, [{label, Label}]) of
{ok, Address = "ct_" ++ _} -> load2(State, Address);
{ok, Address = "th_" ++ _} -> load_from_tx(State, Address);
{ok, Turd} -> handle_troubling(State, {bad_address, Turd});
cancel -> State
end.
load_from_tx(State, Address) ->
case hz:tx_info(Address) of
{ok, #{"call_info" := #{"contract_id" := Contract}}} ->
load2(State, Contract);
{ok, Other} ->
handle_troubling(State, {bad_address, Other});
Error ->
handle_troubling(State, Error)
end.
load2(State = #s{cons = {_, Pages}}, Address) when is_binary(Address) ->
case lists:keyfind(Address, #c.id, Pages) of
false -> load3(State, Address);
#c{} -> State
end;
load2(State, Address) when is_list(Address) ->
load2(State, list_to_binary(Address)).
load3(State, Address) ->
case hz:contract_source(Address) of
{project, [{Name, Source}]} ->
ok = tell("Retrieved ~p from ~p", [Name, Address]),
load4(State, Address, Source);
{ok, Source} ->
ok = tell("Retrieved uncompressed source of ~p", [Address]),
load4(State, Address, Source);
Error ->
handle_troubling(State, Error)
end.
load4(State = #s{tabs = TopBook, cons = {Consbook, Pages}, buttons = Buttons, j = J},
Address,
Source) ->
Window = wxWindow:new(Consbook, ?wxID_ANY),
PageSz = wxBoxSizer:new(?wxVERTICAL),
ProgSz = wxBoxSizer:new(?wxHORIZONTAL),
CodeSz = wxStaticBoxSizer:new(?wxVERTICAL, Window, [{label, J("Contract Source")}]),
CodeTx = gd_sophia_editor:new(Window),
ok = gd_sophia_editor:set_text(CodeTx, Source),
ok = gd_sophia_editor:update(CodeTx),
_ = wxSizer:add(CodeSz, CodeTx, zxw:flags(wide)),
ScrollWin = wxScrolledWindow:new(Window),
FunSz = wxStaticBoxSizer:new(?wxVERTICAL, ScrollWin, [{label, J("Function Interfaces")}]),
ok = wxScrolledWindow:setSizerAndFit(ScrollWin, FunSz),
ok = wxScrolledWindow:setScrollRate(ScrollWin, 5, 5),
ConsSz = wxStaticBoxSizer:new(?wxVERTICAL, Window, [{label, J("Console")}]),
ConsTxStyle = {style, ?wxTE_MULTILINE bor ?wxTE_READONLY},
ConsTx = wxTextCtrl:new(Window, ?wxID_ANY, [ConsTxStyle]),
_ = wxSizer:add(ConsSz, ConsTx, zxw:flags({wide, 5})),
_ = wxSizer:add(ProgSz, CodeSz, [{proportion, 3}, {flag, ?wxEXPAND bor ?wxALL}, {border, 5}]),
_ = wxSizer:add(ProgSz, ScrollWin, [{proportion, 1}, {flag, ?wxEXPAND bor ?wxALL}, {border, 5}]),
_ = wxSizer:add(PageSz, ProgSz, [{proportion, 3}, {flag, ?wxEXPAND bor ?wxALL}, {border, 5}]),
_ = wxSizer:add(PageSz, ConsSz, [{proportion, 1}, {flag, ?wxEXPAND bor ?wxALL}, {border, 5}]),
{Out, IFaces, Build, NewButtons} =
case compile(Source) of
{ok, Output} ->
{aaci, _, Funs, _} = maps:get(aaci, Output),
Callable = maps:remove("init", Funs),
{NB, IFs} = fun_interfaces(ScrollWin, FunSz, Buttons, Callable, J),
O = io_lib:format("Compilation Succeeded!~n~tp~n~nDone!~n", [Output]),
{O, IFs, Output, NB};
Other ->
O = io_lib:format("Compilation Failed!~n~tp~n", [Other]),
{O, [], none, Buttons}
end,
ok = wxWindow:setSizer(Window, PageSz),
ok = wxSizer:layout(PageSz),
true = wxNotebook:addPage(Consbook, Window, Address, [{bSelect, true}]),
Page = #c{id = Address, win = Window,
code = CodeTx, cons = ConsTx,
build = Build, funs = {ScrollWin, IFaces}},
NewPages = Pages ++ [Page],
ok = wxTextCtrl:appendText(ConsTx, Out),
_ = wxNotebook:changeSelection(TopBook, 1),
% TODO: Verify the deployed hash for validity.
State#s{cons = {Consbook, NewPages}, buttons = NewButtons}.
fun_interfaces(ScrollWin, FunSz, Buttons, Funs, J) ->
MakeIface =
fun(Name, {Args, _}) ->
FunName = unicode:characters_to_list([Name, "/", integer_to_list(length(Args))]),
FS = wxBoxSizer:new(?wxHORIZONTAL),
FLabel = wxStaticText:new(ScrollWin, ?wxID_ANY, FunName),
CallBn = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Call")}]),
DryRBn = wxButton:new(ScrollWin, ?wxID_ANY, [{label, J("Dry Run")}]),
_ = wxBoxSizer:add(FS, FLabel, zxw:flags(wide)),
_ = wxBoxSizer:add(FS, CallBn, zxw:flags(base)),
_ = wxBoxSizer:add(FS, DryRBn, zxw:flags(base)),
CallButton = #w{name = {Name, call}, id = wxButton:getId(CallBn), wx = CallBn},
DryRButton = #w{name = {Name, dryr}, id = wxButton:getId(DryRBn), wx = DryRBn},
_ = wxSizer:add(FunSz, FS, zxw:flags({base, 5})),
#f{name = Name, call = CallButton, dryrun = DryRButton, args = Args}
end,
Iterator = maps:iterator(Funs, ordered),
IFaces = maps:map(MakeIface, Iterator),
NewButtons = maps:fold(fun map_iface_buttons/3, Buttons, IFaces),
{NewButtons, IFaces}.
map_iface_buttons(_, #f{call = C = #w{id = CID}, dryrun = D = #w{id = DID}}, A) ->
maps:merge(#{CID => C, DID => D}, A);
map_iface_buttons(_, #f{call = C = #w{id = CID}, dryrun = none}, A) ->
maps:put(CID, C, A).
edit(State = #s{cons = {Consbook, Pages}}) ->
case wxNotebook:getSelection(Consbook) of
?wxNOT_FOUND ->
State;
Index ->
#c{code = CodeTx} = lists:nth(Index + 1, Pages),
Address = wxNotebook:getPageText(Consbook, Index),
Source = gd_sophia_editor:get_text(CodeTx),
add_code_page(State, {hash, Address}, Source)
end.
close_instance(State = #s{cons = {Consbook, Pages}, buttons = Buttons}) ->
case wxNotebook:getSelection(Consbook) of
?wxNOT_FOUND ->
State;
Index ->
{#c{funs = {_, IFaces}}, NewPages} = take_nth(Index + 1, Pages),
log(info, "IFaces: ~tp", [IFaces]),
IDs = list_iface_buttons(maps:values(IFaces)),
NewButtons = maps:without(IDs, Buttons),
true = wxNotebook:deletePage(Consbook, Index),
State#s{cons = {Consbook, NewPages}, buttons = NewButtons}
end.
list_iface_buttons(IFaces) ->
lists:foldl(fun list_iface_buttons/2, [], IFaces).
list_iface_buttons(#f{call = #w{id = CID}, dryrun = #w{id = DID}}, A) ->
[CID, DID | A].
%% Incomplete compiler wrangling
compile(Source) ->
Options = sophia_options(),
case so_compiler:from_string(Source, Options) of
{ok, Build} ->
ACI = maps:get(aci, Build),
AACI = hz_aaci:prepare(ACI),
Complete = maps:put(aaci, AACI, Build),
{ok, Complete};
Other ->
Other
end.
sophia_options() ->
[{aci, json}].
%% (Somewhat silly) Data operations
store_nth(1, E, [_ | T]) -> [E | T];
store_nth(N, E, [H | T]) -> [H | store_nth(N - 1, E, T)].
drop_nth(1, [_ | T]) -> T;
drop_nth(N, [H | T]) -> [H | drop_nth(N - 1, T)].
take_nth(N, L) ->
take_nth(N, L, []).
take_nth(1, [E | T], A) -> {E, lists:reverse(A) ++ T};
take_nth(N, [H | T], A) -> take_nth(N - 1, T, [H | A]).
keyfind_index(K, E, L) ->
keyfind_index(K, E, 1, L).
keyfind_index(K, E, I, [H | T]) ->
case element(E, H) =:= K of
false -> keyfind_index(K, E, I + 1, T);
true -> {ok, I}
end;
keyfind_index(_, _, _, []) ->
error.
+3 -7
View File
@@ -1,5 +1,5 @@
-module(gd_v_netman).
-vsn("0.7.0").
-vsn("0.10.0").
-author("Craig Everett <zxq9@zxq9.com>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").
@@ -14,13 +14,9 @@
handle_call/3, handle_cast/2, handle_info/2, handle_event/2]).
-include("$zx_include/zx_logger.hrl").
-include("gd.hrl").
-include("gdl.hrl").
-record(w,
{name = none :: atom(),
id = 0 :: integer(),
wx = none :: none | wx:wx_object()}).
-record(s,
{wx = none :: none | wx:wx_object(),
frame = none :: none | wx:wx_object(),
@@ -60,7 +56,7 @@ start_link(Args) ->
init({Prefs, Manifest}) ->
Lang = maps:get(lang, Prefs, en_us),
Lang = maps:get(lang, Prefs, en),
Trans = gd_jt:read_translations(?MODULE),
J = gd_jt:j(Lang, Trans),
Wx = wx:new(),
+22 -88
View File
@@ -13,7 +13,7 @@
-module(gd_v_wallman).
-vsn("0.7.0").
-vsn("0.10.0").
-author("Craig Everett <zxq9@zxq9.com>").
-copyright("QPQ AG <info@qpq.swiss>").
-license("GPL-3.0-or-later").
@@ -28,13 +28,9 @@
handle_call/3, handle_cast/2, handle_info/2, handle_event/2]).
-include("$zx_include/zx_logger.hrl").
-include("gd.hrl").
-include("gdl.hrl").
-record(w,
{name = none :: atom(),
id = 0 :: integer(),
wx = none :: none | wx:wx_object()}).
-record(s,
{wx = none :: none | wx:wx_object(),
frame = none :: none | wx:wx_object(),
@@ -90,7 +86,7 @@ start_link(Args) ->
init({Prefs, Manifest}) ->
Lang = maps:get(lang, Prefs, en_us),
Lang = maps:get(lang, Prefs, en),
Trans = gd_jt:read_translations(?MODULE),
J = gd_jt:j(Lang, Trans),
Wx = wx:new(),
@@ -112,12 +108,12 @@ init({Prefs, Manifest}) ->
MakeButton =
fun({Name, Label}) ->
B = wxButton:new(Frame, ?wxID_ANY, [{label, Label}]),
_ = wxSizer:add(ButtSz, B, zxw:flags(wide)),
_ = wxSizer:add(ButtSz, B, zxw:flags({wide, 5})),
#w{name = Name, id = wxButton:getId(B), wx = B}
end,
Buttons = lists:map(MakeButton, ButtonTemplates),
_ = wxSizer:add(MainSz, Picker, zxw:flags(wide)),
_ = wxSizer:add(MainSz, Picker, zxw:flags({wide, 5})),
_ = wxSizer:add(MainSz, ButtSz, zxw:flags(base)),
ok = wxFrame:setSizer(Frame, MainSz),
@@ -317,41 +313,15 @@ do_open2(Selected, State = #s{wallets = Wallets}) ->
end.
do_open3(Path, State = #s{frame = Frame, j = J}) ->
Label = J("Password"),
Dialog = wxDialog:new(Frame, ?wxID_ANY, Label),
Sizer = wxBoxSizer:new(?wxVERTICAL),
PassSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, Label}]),
PassTx = wxTextCtrl:new(Dialog, ?wxID_ANY, [{style, ?wxTE_PASSWORD}]),
_ = wxStaticBoxSizer:add(PassSz, PassTx, zxw:flags(wide)),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
_ = wxBoxSizer:add(Sizer, PassSz, zxw:flags(base)),
_ = wxBoxSizer:add(Sizer, ButtSz, zxw:flags(wide)),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxBoxSizer:layout(Sizer),
ok = wxDialog:setSize(Dialog, {500, 130}),
ok = wxDialog:center(Dialog),
ok = wxStyledTextCtrl:setFocus(PassTx),
case wxDialog:showModal(Dialog) of
?wxID_OK ->
case wxTextCtrl:getValue(PassTx) of
"" ->
ok = wxDialog:destroy(Dialog),
ensure_shown(Frame);
Phrase ->
ok = wxDialog:destroy(Dialog),
case gd_con:open_wallet(Path, Phrase) of
ok ->
do_close(State);
Error ->
ok = ensure_shown(Frame),
trouble(Error)
end
Title = J("Passphrase"),
case zxw_modal_text:show(Frame, Title, [{password, true}]) of
{ok, Phrase} ->
case gd_con:open_wallet(Path, Phrase) of
ok -> do_close(State);
Error -> trouble(Error)
end;
?wxID_CANCEL ->
ok = wxDialog:destroy(Dialog),
ensure_shown(Frame)
cancel ->
ok
end.
@@ -538,51 +508,15 @@ do_import2(_, "", _, _) ->
abort;
do_import2(Dir, File, J, Frame) ->
Path = filename:join(Dir, File),
Dialog = wxDialog:new(Frame, ?wxID_ANY, J("Import Wallet")),
Sizer = wxBoxSizer:new(?wxVERTICAL),
NameSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Name")}]),
NameTx = wxTextCtrl:new(Dialog, ?wxID_ANY),
_ = wxSizer:add(NameSz, NameTx, zxw:flags(wide)),
PassSz = wxStaticBoxSizer:new(?wxVERTICAL, Dialog, [{label, J("Passphrase")}]),
PassTx = wxTextCtrl:new(Dialog, ?wxID_ANY),
_ = wxSizer:add(PassSz, PassTx, zxw:flags(wide)),
ButtSz = wxBoxSizer:new(?wxHORIZONTAL),
Affirm = wxButton:new(Dialog, ?wxID_OK),
Cancel = wxButton:new(Dialog, ?wxID_CANCEL),
_ = wxBoxSizer:add(ButtSz, Affirm, zxw:flags(wide)),
_ = wxBoxSizer:add(ButtSz, Cancel, zxw:flags(wide)),
_ = wxSizer:add(Sizer, NameSz, zxw:flags(base)),
_ = wxSizer:add(Sizer, PassSz, zxw:flags(base)),
_ = wxSizer:add(Sizer, ButtSz, zxw:flags(wide)),
ok = wxDialog:setSizer(Dialog, Sizer),
ok = wxBoxSizer:layout(Sizer),
ok = wxFrame:setSize(Dialog, {500, 200}),
ok = wxFrame:center(Dialog),
ok = wxStyledTextCtrl:setFocus(NameTx),
Result =
case wxDialog:showModal(Dialog) of
?wxID_OK ->
Name =
case wxTextCtrl:getValue(NameTx) of
"" -> Path;
N -> N
end,
Pass =
case wxTextCtrl:getValue(PassTx) of
"" -> none;
P -> P
end,
gd_con:import_wallet(Name, Path, Pass);
?wxID_CANCEL ->
abort
end,
ok = wxDialog:destroy(Dialog),
Result.
Title = J("Import Wallet"),
NameL = J("Wallet Name"),
PassL = J("Passphrase (leave blank if none)"),
OK_L = J("OK"),
CancelL = J("Cancel"),
case gd_m_wallet_importer:show(Frame, Title, NameL, PassL, OK_L, CancelL) of
{ok, Name, Pass} -> gd_con:import_wallet(Name, Path, Pass);
cancel -> abort
end.
do_drop(State = #s{picker = Picker}) ->
+4 -4
View File
@@ -4,8 +4,9 @@
{prefix,"gd"}.
{author,"Craig Everett"}.
{desc,"A desktop client for the Gajumaru network of blockchain networks"}.
{package_id,{"otpr","gajudesk",{0,7,0}}}.
{deps,[{"otpr","hakuzaru",{0,6,1}},
{package_id,{"otpr","gajudesk",{0,10,0}}}.
{deps,[{"otpr","hakuzaru",{0,9,1}},
{"otpr","zxwidgets",{1,1,0}},
{"otpr","eblake2",{1,0,1}},
{"otpr","base58",{0,1,1}},
{"otpr","gmserialization",{0,1,3}},
@@ -13,8 +14,7 @@
{"otpr","gmbytecode",{3,4,1}},
{"otpr","lom",{1,0,0}},
{"otpr","zj",{1,1,0}},
{"otpr","ec_utils",{1,0,0}},
{"otpr","zxwidgets",{1,0,1}}]}.
{"otpr","ec_utils",{1,0,0}}]}.
{key_name,none}.
{a_email,"craigeverett@qpq.swiss"}.
{c_email,"info@qpq.swiss"}.